gentoo resync : 04.01.2022

14 files changed, 29 insertions, 549 deletions

diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index 3c136cc24381..cbaed374fee3 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -1,24 +1,4 @@
-AUX legion-16.08.0-hwloc.patch 825 BLAKE2B 9749cbbcb314b52f02dc7887b15320c1fbd0d872eab82a78c8a3439b087a33fea1af4f36ad34c64e1517ceb62657479b7130ba8d71c5b36123978aeb388ffadb SHA512 a5fb493f9b99fc2fc48d283990684efdbbe835ffd1d50084ceaf40adeda4a362ae3cff1095c4b3d655e676568faf5ec584e794a6d6cde62cc6fec40486012b80
-AUX legion-16.08.0-multilib.patch 3874 BLAKE2B 7399e267c61cef6e59cc8a4e0f6b3f063c49abd3fa7f25f83fe240bdbf5cea44c34746bcc5bb872e6ac5bd760af04bde2b080d9ee18d0eb2f44044fafed164e8 SHA512 6613fdf2a06e8d46eda9b540681cfa4a8e820d5306397d5dcd1e45e9f80aa348dd36200606fe6667f5371794f2e4505b1e799d7aa8a18ba354ea368de0e33ac6
-DIST legion-16.08.0.tar.gz 2501054 BLAKE2B 92951f768dbafbc1ed06c74ae7a9ceba0a40c7636f5115772d86993c3165c4acd07c844d10d4da00e48abc3914a5a4865a2779b198f073fbcea6857959a507d2 SHA512 8847fa8c0c7683812dd6ffb038a4d6d3427fdfde62ec917ab32e9a15cd7320321cab2b106479589aa2451cabd98cd0b1dc88b4ff668f991bb4c95f383de785a5
-DIST legion-16.10.0.tar.gz 2474656 BLAKE2B 6be9f17adcb1baaf2da7fcffc76cfe6a6918306ec8c2663797eb653b0dbb81450ce9549008fc97d4a3c03910a64e44a10f0c995b7e8193bb085dd7a0c90fd888 SHA512 cfe610fef047def835f95adcc4ae52d7844a4a89a5bdebb2ec40b0e63a66aba9d180bd78e559762b1ac18f84c1ca1142c3e73238dbe4c516672a8843335442a5
-DIST legion-17.02.0.tar.gz 2690415 BLAKE2B 6278b65c049e4909fdbe330f875e9649dfbca80e806d891f5da4a2c52928a56ebe04e7b17be4c2df2b5ad57b16a88d5eff86d75e00395f9a874d2555bc17cd15 SHA512 0c6ee53953ec2e5072d39b1c1260a1783393feaf7064f381bb1733cf9cdb1be8fd521a35e0a452ebc9e9509d117fdc6f3e472cdb6c633ba00c987c880a33bc2d
-DIST legion-17.05.0.tar.gz 2783482 BLAKE2B aad4da51237b19504949c13e3f6e021468042186fe55a41dde44e51066504df98e07fd6abf531cb4f46e1d7f7f1cf05f471d0394f092d9504e47f78ae8675dc5 SHA512 51532f043eea1467a2b8ff17004f224c763f411eb5940d0a4dc5d8eb6503d758964aba26eb4977c68264c7344fcf269682a428e86a2c1a756f91cc9c50d04677
-DIST legion-17.08.0.tar.gz 2839522 BLAKE2B b9f9d814b319c69a1e29b108c7d78fcd04f87d58371baf1c102eb9eee8c435d0127aed507bbcbf096e2b78705f39e88400251b2e0d46931688ed30cb51f93e89 SHA512 5d97157f97e12149e5fdf3a75d2e6e8a41ebf97e09c35501e2c93437bd0a47643d261f68c6b4a83b47e64d706f35914acd3a852eb0c08a11696b05ba9ef7af87
-DIST legion-17.10.0.tar.gz 2975023 BLAKE2B 772f666c0cd8fc96e1e460e4c8253289069eea2ed8820f091ad517228fb7b2d56bc8bedbe9bc4d5776869fc4f0250f71644bf773362f65a0bba6f96be51c32af SHA512 c4be9b32b47b3c4ae38374606125867f963a109dd542a52ee20b2964e5849121207d78947f0ab6ea4ed5e8a027b26da7b1a3a61124f175c1b9f7323e56b8d9b2
-DIST legion-18.02.0.tar.gz 2967232 BLAKE2B 5f22efe681ee036af95b3d84c104988acfea899b76684860c1a27dda27b757c7a444ea5c1cec70ce0a19ffaa8323c208997402971017f72415a12ff9aabadea5 SHA512 052026c6f7e3920bfe097ada83571e4f7d4ad74a59d4a84af4d35f089c5d1b216e90f4f8547ea894e4b53b138b81e594c60342c41557c985b64d08c4aca23794
-DIST legion-18.05.0.tar.gz 3009091 BLAKE2B 86c113cad11e2fbdcf03233c09fe429ceff12aaac6621e0ae22ac141cf7a6c62f7df23f78861a826ba55a45c3eae46ca60b9e47339f9ed3333560797733b7d4e SHA512 f7000b5a6b66d07d72de9be7ef0bcdfd7aa95f838bfc1ccb4b146cf0c4407682a5cde75b56311bb07abd808dc67527e02a3a3db10bca874028a7335b54e1120a
-DIST legion-18.12.0.tar.gz 3138868 BLAKE2B c85faf51eb528085f05a5e3411253f0ceb4ef6c6252466861d5641bd2df8320738d3cfd864781c05986038ed84cb6bec95d889f3d4d1ef8b25d90f2d339a9300 SHA512 26fc5d0fe1743de3e634fa3c2d95c3758b21bba7a1e1eb66c4c69d43d0d557b595b691b1bcd091f2c23ea034f000491ea6d5d81da94fb531781462e3093a202d
-DIST legion-19.06.0.tar.gz 3245617 BLAKE2B 5f94d423c1ff4e708a7826ead55a4f8f965bb5f49fffb83b0cd1b1909f0c21808a90e0c7c09e03b6e7b6736c212e86ac1765ab3665940f3a3e97551c152e4993 SHA512 244b4ff02a20427c81921920c65a64325cea698bb466ba036fc577e4a2722769dafa817083b76ba3c39c7a5fd749ab43122c518b657665aa7c309c8b46833414
-EBUILD legion-16.08.0-r2.ebuild 862 BLAKE2B 02a07a1ecd975739cfd3e410b51eb47b09265ba427f659f4213c4d21b940968d90fe131d66148f5af1258ab1261a8888238fd65df3bd0cb09ed2c60f6b9adf8d SHA512 a3f0dc9e6fa5769e67bf6e296348a06172f365f5603b58f3e4c422c86ac58022abda806217abb5e99008d0cfe146332565a07ff3c9b64b881aa689469570b619
-EBUILD legion-16.10.0-r1.ebuild 689 BLAKE2B b4ff53fa2d66abb98c37a4c7a2f9585f504586d2d595889c96ce30b857e1396ca6e816f9f3c08c74beff2668d1b022746abc2fcb4997b81a85691db61f493cb6 SHA512 297b97bba23bd4cf470a4a4f3317277e5ba0a4ee3eb62668d50b5d46d9ddff58b74b1c1d49d92a0d2e2ed5c58c02123fe01e445676e2c74e846a66f2c357df29
-EBUILD legion-17.02.0-r1.ebuild 744 BLAKE2B d6c8ca2c67aabcb0e8242ce43184eba77a7582277fe1663e88172c0d9d870db583c8d99b1a8707096b73b46f3951ae75ad3565064d54c37f0cc064c20439c214 SHA512 3e2dcd02106bca2378b95735d317e7b57c9253b69c294c492d55bc83e181e50e9879ff4d1e8bbe924a746e6c468f224716c471cdc8bbebe110349eb919e74a23
-EBUILD legion-17.05.0-r1.ebuild 890 BLAKE2B 5abd28bba5de95afcb101ee78f1961ee0c97a49af4223d90a7b249314cd479f97fb62eaa17828c8734c02562547aface3b9edc4e8fbe4ef5b209e5db3e7e65d2 SHA512 9deff35ddb9c16d15f23d0487b786cc966bdc5f92c158f7b30d3b874bf7fbe51dcb353610bc0ac5f57d3f77355df94d98b1c10deb5c3351202999961b0ea55ad
-EBUILD legion-17.08.0-r1.ebuild 961 BLAKE2B 711862e308ce9039d1efa807b615791cf307a8f6abb29e8712983955b1ebf0a3a4745cadd75a8a7d74d2505b86b55b6ed3b961085a0aeb35180fce6094fd61cf SHA512 4ef301ef305a4ed47640fbf40ee0f6e83ae9514bb02636ba7773df7ce0cadfc59cd1af2168c7867b2b3ff6ba0a2e18e4a0f7086c3c223b5fbe64733564071036
-EBUILD legion-17.10.0-r1.ebuild 961 BLAKE2B 711862e308ce9039d1efa807b615791cf307a8f6abb29e8712983955b1ebf0a3a4745cadd75a8a7d74d2505b86b55b6ed3b961085a0aeb35180fce6094fd61cf SHA512 4ef301ef305a4ed47640fbf40ee0f6e83ae9514bb02636ba7773df7ce0cadfc59cd1af2168c7867b2b3ff6ba0a2e18e4a0f7086c3c223b5fbe64733564071036
-EBUILD legion-18.02.0-r1.ebuild 961 BLAKE2B 711862e308ce9039d1efa807b615791cf307a8f6abb29e8712983955b1ebf0a3a4745cadd75a8a7d74d2505b86b55b6ed3b961085a0aeb35180fce6094fd61cf SHA512 4ef301ef305a4ed47640fbf40ee0f6e83ae9514bb02636ba7773df7ce0cadfc59cd1af2168c7867b2b3ff6ba0a2e18e4a0f7086c3c223b5fbe64733564071036
-EBUILD legion-18.05.0-r1.ebuild 964 BLAKE2B da4ef2ccd70a753e6fdb51b57184ae4f3fa556f4533952f5423d413d5965a21b11cb20cd80f2768a3b7296f028c037185777e9b76de6845137855441fcc04af1 SHA512 25f99d2fad0f125d17e4b0dcf889fc52ea5dcda824ab43cd91ed9b8fc75f1dc59402fb0743ea0bf85bb995fbc81534d77b35506a55ce7971afefc32a071326f9
-EBUILD legion-18.12.0-r1.ebuild 964 BLAKE2B da4ef2ccd70a753e6fdb51b57184ae4f3fa556f4533952f5423d413d5965a21b11cb20cd80f2768a3b7296f028c037185777e9b76de6845137855441fcc04af1 SHA512 25f99d2fad0f125d17e4b0dcf889fc52ea5dcda824ab43cd91ed9b8fc75f1dc59402fb0743ea0bf85bb995fbc81534d77b35506a55ce7971afefc32a071326f9
-EBUILD legion-19.06.0-r1.ebuild 964 BLAKE2B da4ef2ccd70a753e6fdb51b57184ae4f3fa556f4533952f5423d413d5965a21b11cb20cd80f2768a3b7296f028c037185777e9b76de6845137855441fcc04af1 SHA512 25f99d2fad0f125d17e4b0dcf889fc52ea5dcda824ab43cd91ed9b8fc75f1dc59402fb0743ea0bf85bb995fbc81534d77b35506a55ce7971afefc32a071326f9
-EBUILD legion-9999.ebuild 964 BLAKE2B da4ef2ccd70a753e6fdb51b57184ae4f3fa556f4533952f5423d413d5965a21b11cb20cd80f2768a3b7296f028c037185777e9b76de6845137855441fcc04af1 SHA512 25f99d2fad0f125d17e4b0dcf889fc52ea5dcda824ab43cd91ed9b8fc75f1dc59402fb0743ea0bf85bb995fbc81534d77b35506a55ce7971afefc32a071326f9
+DIST legion-21.09.0.tar.gz 4017440 BLAKE2B 8f2919ed89f94cd12aff761de0e91ea0b5f9fd6001b83f69f8aff4703df159f001c562ed62ac22404fb15ebecc86a175d7acb528aba2e2d05ef7a6e6c0a9d830 SHA512 ffdbc8fa50100b7feb1709299dc1a9d01f14a6368812a6c5c16fa58746e9627f20863060c3ca25fd8865c8569c5a5f274a0298902bb82f6567b05299f55f6f75
+EBUILD legion-21.09.0-r1.ebuild 1021 BLAKE2B e9f59f836af17a8f4d47935d5fe3a22429eb6aa3d54c06eeac18bda87fb87f8ff783e001ef63111e93e645ee14f99cf1440ee81a54c62d523da6e9231e5b673e SHA512 2553d8d2c65cb1f38614a424f4753fb8b46d8eea5aa5bfb81b10995154ed5970af4992aebd405a6549277d687e28f60bfebf1ba596254986bb68f696f3267d54
+EBUILD legion-9999.ebuild 1021 BLAKE2B e9f59f836af17a8f4d47935d5fe3a22429eb6aa3d54c06eeac18bda87fb87f8ff783e001ef63111e93e645ee14f99cf1440ee81a54c62d523da6e9231e5b673e SHA512 2553d8d2c65cb1f38614a424f4753fb8b46d8eea5aa5bfb81b10995154ed5970af4992aebd405a6549277d687e28f60bfebf1ba596254986bb68f696f3267d54
 MISC metadata.xml 483 BLAKE2B 2acf9792efe87678449a543be25ee16b3b6652b1e44200259f8b8e0de6982183ed5230228c097c6f01119eb209d56123e0b9d81b86198fcf10587a82a3f76da6 SHA512 35543d28f4248bb5b83d19ef3635a0b787a9600cf7687f6a1ed37f4fae16df14eed0951d5c6a51bfe9ddee9e790a65983d5a3559514ce8980ef138088c0eb9b2
diff --git a/sys-cluster/legion/files/legion-16.08.0-hwloc.patch b/sys-cluster/legion/files/legion-16.08.0-hwloc.patch
deleted file mode 100644
index f9e270c1798b..000000000000
--- a/sys-cluster/legion/files/legion-16.08.0-hwloc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8c636a8547b1695105501b8b7c8c713094ef7921 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <christoph.junghans@gmail.com>
-Date: Fri, 2 Sep 2016 15:26:51 -0600
-Subject: [PATCH] FindHWLOC.cmake: fix syntax error
-
----
- cmake/FindHWLOC.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/FindHWLOC.cmake b/cmake/FindHWLOC.cmake
-index 1019b59..1e9e97d 100644
---- a/cmake/FindHWLOC.cmake
-+++ b/cmake/FindHWLOC.cmake
-@@ -28,7 +28,7 @@ if(NOT HWLOC_FOUND AND NOT TARGET HWLOC)
-     # Save the existing prefix options
-     set(_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
-     set(_CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH})
--    set(CMAKE_PREFIX_PATH ${HWLOC_ROOT_DIR}
-+    set(CMAKE_PREFIX_PATH ${HWLOC_ROOT_DIR})
-     unset(CMAKE_LIBRARY_PATH)
-     set(_HWLOC_FIND_OPTS
-       NO_CMAKE_ENVIRONMENT_PATH
diff --git a/sys-cluster/legion/files/legion-16.08.0-multilib.patch b/sys-cluster/legion/files/legion-16.08.0-multilib.patch
deleted file mode 100644
index 7ddd9a880980..000000000000
--- a/sys-cluster/legion/files/legion-16.08.0-multilib.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From f9b71c86098c16436c3a51d8706f52f720ef008d Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@lanl.gov>
-Date: Fri, 2 Sep 2016 15:54:49 -0600
-Subject: [PATCH] cmake: support multilib
-
----
- CMakeLists.txt         | 26 ++++++++++++++++----------
- runtime/CMakeLists.txt |  8 ++++----
- 2 files changed, 20 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 726e8e4..181a2bd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,12 +20,18 @@ project(Legion)
- #------------------------------------------------------------------------------#
- # Some boilerplate to setup nice output directories
- #------------------------------------------------------------------------------#
-+
-+#for multilib distros
-+if (NOT DEFINED LIB)
-+  set(LIB "lib")
-+endif(NOT DEFINED LIB)
-+
- list(INSERT CMAKE_MODULE_PATH 0 "${Legion_SOURCE_DIR}/cmake")
- if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
--  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/lib)
-+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/${LIB})
- endif()
- if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
--  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/lib)
-+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/${LIB})
- endif()
- if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/bin)
-@@ -50,7 +56,7 @@ option(Legion_USE_HWLOC "Use hwloc for topology awareness" OFF)
- if(Legion_USE_HWLOC)
-   find_package(HWLOC REQUIRED)
-   install(FILES ${Legion_SOURCE_DIR}/cmake/FindHWLOC.cmake
--    DESTINATION lib/cmake/Legion
-+    DESTINATION ${LIB}/cmake/Legion
-   )
- endif()
- 
-@@ -69,7 +75,7 @@ if(Legion_USE_GASNet)
-   mark_as_advanced(GASNet_CONDUIT)
-   find_package(GASNet REQUIRED)
-   install(FILES ${Legion_SOURCE_DIR}/cmake/FindGASNet.cmake
--    DESTINATION lib/cmake/Legion
-+    DESTINATION ${LIB}/cmake/Legion
-   )
- endif()
- 
-@@ -81,7 +87,7 @@ if(Legion_USE_LLVM)
-   set(Legion_LLVM_COMPONENTS irreader jit mcjit x86)
-   find_package(LLVM REQUIRED COMPONENTS ${Legion_LLVM_COMPONENTS})
-   install(FILES ${Legion_SOURCE_DIR}/cmake/FindLLVM.cmake
--    DESTINATION lib/cmake/Legion
-+    DESTINATION ${LIB}/cmake/Legion
-   )
- endif()
- 
-@@ -97,10 +103,10 @@ if(Legion_USE_CUDA)
-   endif()
-   find_package(CUDA REQUIRED)
-   install(FILES ${Legion_SOURCE_DIR}/cmake/FindCUDA.cmake
--    DESTINATION lib/cmake/Legion
-+    DESTINATION ${LIB}/cmake/Legion
-   )
-   install(FILES ${Legion_SOURCE_DIR}/cmake/newcmake/FindCUDA.cmake
--    DESTINATION lib/cmake/Legion/newcmake
-+    DESTINATION ${LIB}/cmake/Legion/newcmake
-   )
- endif()
- 
-@@ -128,7 +134,7 @@ export(EXPORT LegionTargets
- install(EXPORT LegionTargets
-   NAMESPACE Legion::
-   FILE LegionTargets.cmake
--  DESTINATION lib/cmake/Legion
-+  DESTINATION ${LIB}/cmake/Legion
- )
- 
- configure_file(
-@@ -137,7 +143,7 @@ configure_file(
-   @ONLY
- )
- install(FILES ${Legion_BINARY_DIR}/LegionConfigCommon.cmake
--  DESTINATION lib/cmake/Legion
-+  DESTINATION ${LIB}/cmake/Legion
- )
- 
- configure_file(
-@@ -147,7 +153,7 @@ configure_file(
- )
- 
- install(FILES cmake/LegionConfig-install.cmake
--  DESTINATION lib/cmake/Legion
-+  DESTINATION ${LIB}/cmake/Legion
-   RENAME LegionConfig.cmake
- )
- 
-diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
-index e21e141..91f6a03 100644
---- a/runtime/CMakeLists.txt
-+++ b/runtime/CMakeLists.txt
-@@ -176,8 +176,8 @@ target_include_directories(LowLevelRuntime
- )
- 
- install(TARGETS LowLevelRuntime EXPORT LegionTargets
--  LIBRARY DESTINATION lib
--  ARCHIVE DESTINATION lib
-+  LIBRARY DESTINATION ${LIB}
-+  ARCHIVE DESTINATION ${LIB}
-   RUNTIME DESTINATION bin
- )
- 
-@@ -244,8 +244,8 @@ target_include_directories(HighLevelRuntime
- )
- 
- install(TARGETS HighLevelRuntime EXPORT LegionTargets
--  LIBRARY DESTINATION lib
--  ARCHIVE DESTINATION lib
-+  LIBRARY DESTINATION ${LIB}
-+  ARCHIVE DESTINATION ${LIB}
-   RUNTIME DESTINATION bin
- )
- 
--- 
-2.7.3
-
diff --git a/sys-cluster/legion/legion-16.08.0-r2.ebuild b/sys-cluster/legion/legion-16.08.0-r2.ebuild
deleted file mode 100644
index 7295a5f41e45..000000000000
--- a/sys-cluster/legion/legion-16.08.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gasnet +hwloc"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-#https://github.com/StanfordLegion/legion/pull/166
-#https://github.com/StanfordLegion/legion/pull/167
-PATCHES=( "${FILESDIR}/${P}-hwloc.patch" "${FILESDIR}/${P}-multilib.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DBUILD_SHARED_LIBS=ON
-		-DLIB=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-16.10.0-r1.ebuild b/sys-cluster/legion/legion-16.10.0-r1.ebuild
deleted file mode 100644
index 50372479f2c9..000000000000
--- a/sys-cluster/legion/legion-16.10.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gasnet +hwloc"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-17.02.0-r1.ebuild b/sys-cluster/legion/legion-17.02.0-r1.ebuild
deleted file mode 100644
index 4ab8ed801e4e..000000000000
--- a/sys-cluster/legion/legion-17.02.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gasnet +hwloc"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-17.05.0-r1.ebuild b/sys-cluster/legion/legion-17.05.0-r1.ebuild
deleted file mode 100644
index 0746074ce71d..000000000000
--- a/sys-cluster/legion/legion-17.05.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-else
-	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="gasnet +hwloc"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-17.08.0-r1.ebuild b/sys-cluster/legion/legion-17.08.0-r1.ebuild
deleted file mode 100644
index c883f98f82d2..000000000000
--- a/sys-cluster/legion/legion-17.08.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-else
-	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="gasnet +hwloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-17.10.0-r1.ebuild b/sys-cluster/legion/legion-17.10.0-r1.ebuild
deleted file mode 100644
index c883f98f82d2..000000000000
--- a/sys-cluster/legion/legion-17.10.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-else
-	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="gasnet +hwloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-18.02.0-r1.ebuild b/sys-cluster/legion/legion-18.02.0-r1.ebuild
deleted file mode 100644
index c883f98f82d2..000000000000
--- a/sys-cluster/legion/legion-18.02.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-else
-	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="gasnet +hwloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc:= )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-18.12.0-r1.ebuild b/sys-cluster/legion/legion-18.12.0-r1.ebuild
deleted file mode 100644
index bc5ad7cee85d..000000000000
--- a/sys-cluster/legion/legion-18.12.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-else
-	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="gasnet +hwloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( <sys-apps/hwloc-2:= )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-19.06.0-r1.ebuild b/sys-cluster/legion/legion-19.06.0-r1.ebuild
deleted file mode 100644
index bc5ad7cee85d..000000000000
--- a/sys-cluster/legion/legion-19.06.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A data-centric parallel programming system"
-HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
-else
-	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="gasnet +hwloc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( <sys-apps/hwloc-2:= )
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-18.05.0-r1.ebuild b/sys-cluster/legion/legion-21.09.0-r1.ebuild
index bc5ad7cee85d..55c79a8cda25 100644
--- a/sys-cluster/legion/legion-18.05.0-r1.ebuild
+++ b/sys-cluster/legion/legion-21.09.0-r1.ebuild
@@ -1,41 +1,42 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A data-centric parallel programming system"
 HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${P}
+
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="gasnet +hwloc test"
+IUSE="examples gasnet hwloc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+# See bug #821424 for examples/mpi
+DEPEND="examples? ( virtual/mpi[cxx] )
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( <sys-apps/hwloc-2:= )
-	"
+	hwloc? ( <sys-apps/hwloc-2:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DLegion_USE_HWLOC=$(usex hwloc)
 		-DLegion_USE_GASNet=$(usex gasnet)
 		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
+		-DLegion_BUILD_EXAMPLES=$(usex examples)
 		-DLegion_BUILD_TESTS=ON
 		-DLegion_BUILD_TUTORIAL=ON
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
diff --git a/sys-cluster/legion/legion-9999.ebuild b/sys-cluster/legion/legion-9999.ebuild
index bc5ad7cee85d..55c79a8cda25 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-9999.ebuild
@@ -1,41 +1,42 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A data-centric parallel programming system"
 HOMEPAGE="https://legion.stanford.edu/"
-if [[ ${PV} = 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://StanfordLegion/${PN}.git https://github.com/StanfordLegion/${PN}.git"
 else
 	SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${P}
+
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${P}"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="gasnet +hwloc test"
+IUSE="examples gasnet hwloc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+# See bug #821424 for examples/mpi
+DEPEND="examples? ( virtual/mpi[cxx] )
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( <sys-apps/hwloc-2:= )
-	"
+	hwloc? ( <sys-apps/hwloc-2:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DLegion_USE_HWLOC=$(usex hwloc)
 		-DLegion_USE_GASNet=$(usex gasnet)
 		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
+		-DLegion_BUILD_EXAMPLES=$(usex examples)
 		-DLegion_BUILD_TESTS=ON
 		-DLegion_BUILD_TUTORIAL=ON
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }