gentoo resync : 30.10.2021

14 files changed, 114 insertions, 103 deletions

diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
index 8f079301217a..3c136cc24381 100644
--- a/sys-cluster/legion/Manifest
+++ b/sys-cluster/legion/Manifest
@@ -10,15 +10,15 @@ DIST legion-18.02.0.tar.gz 2967232 BLAKE2B 5f22efe681ee036af95b3d84c104988acfea8
 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-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 868 BLAKE2B 748caa1d25edef8a0a5f22f4f9f949cf88af806806a36393eb135733b01ac6d6abf95e03e68fc6141d40f7e2c14e34aaf713e2edd0898e9c4c43f4efbebb137a SHA512 80cd1628c044707786df858962826d750186e9675d2241cb5e3d46cd01c0046d14739cb5a5f64184481cc8cbd622f3bddf3380eaddb46361c20cec9799d53230
-EBUILD legion-17.08.0.ebuild 939 BLAKE2B 03b672c806b0904fb75b429ff68de8b065721704cb0856871958263c68ba3450cf96bdb55071ecae035fec329d265326d523a8b023807b28b0ebcb575762715a SHA512 7061bf87fec3d89b859ab708b3906675d52ad25bae91e1e8b14fb0700757044b28fd0d029e8403d743a08ae55d79aa5bc0ff05440cb84019787d9c73549f0a18
-EBUILD legion-17.10.0.ebuild 939 BLAKE2B 03b672c806b0904fb75b429ff68de8b065721704cb0856871958263c68ba3450cf96bdb55071ecae035fec329d265326d523a8b023807b28b0ebcb575762715a SHA512 7061bf87fec3d89b859ab708b3906675d52ad25bae91e1e8b14fb0700757044b28fd0d029e8403d743a08ae55d79aa5bc0ff05440cb84019787d9c73549f0a18
-EBUILD legion-18.02.0.ebuild 939 BLAKE2B 03b672c806b0904fb75b429ff68de8b065721704cb0856871958263c68ba3450cf96bdb55071ecae035fec329d265326d523a8b023807b28b0ebcb575762715a SHA512 7061bf87fec3d89b859ab708b3906675d52ad25bae91e1e8b14fb0700757044b28fd0d029e8403d743a08ae55d79aa5bc0ff05440cb84019787d9c73549f0a18
-EBUILD legion-18.05.0.ebuild 942 BLAKE2B 7e3411acef7f1c76fa0c4295bc766c6edbd3f540a9d275f3b4ccb08350ae26a94ed0e05f604aec38478743c250b3c71c7c1a530e71101a9d41c07247eacaeb6b SHA512 ef4ef6a497559a05ac449775f7214176c0bec07aa15e528e5b353b84beb63dde80a36d11bbfb7e9090beaef91825416466026c205e0532a275a59bbc69de2c85
-EBUILD legion-18.12.0.ebuild 942 BLAKE2B 7e3411acef7f1c76fa0c4295bc766c6edbd3f540a9d275f3b4ccb08350ae26a94ed0e05f604aec38478743c250b3c71c7c1a530e71101a9d41c07247eacaeb6b SHA512 ef4ef6a497559a05ac449775f7214176c0bec07aa15e528e5b353b84beb63dde80a36d11bbfb7e9090beaef91825416466026c205e0532a275a59bbc69de2c85
-EBUILD legion-19.06.0.ebuild 942 BLAKE2B 7e3411acef7f1c76fa0c4295bc766c6edbd3f540a9d275f3b4ccb08350ae26a94ed0e05f604aec38478743c250b3c71c7c1a530e71101a9d41c07247eacaeb6b SHA512 ef4ef6a497559a05ac449775f7214176c0bec07aa15e528e5b353b84beb63dde80a36d11bbfb7e9090beaef91825416466026c205e0532a275a59bbc69de2c85
-EBUILD legion-9999.ebuild 942 BLAKE2B 7e3411acef7f1c76fa0c4295bc766c6edbd3f540a9d275f3b4ccb08350ae26a94ed0e05f604aec38478743c250b3c71c7c1a530e71101a9d41c07247eacaeb6b SHA512 ef4ef6a497559a05ac449775f7214176c0bec07aa15e528e5b353b84beb63dde80a36d11bbfb7e9090beaef91825416466026c205e0532a275a59bbc69de2c85
+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
 MISC metadata.xml 483 BLAKE2B 2acf9792efe87678449a543be25ee16b3b6652b1e44200259f8b8e0de6982183ed5230228c097c6f01119eb209d56123e0b9d81b86198fcf10587a82a3f76da6 SHA512 35543d28f4248bb5b83d19ef3635a0b787a9600cf7687f6a1ed37f4fae16df14eed0951d5c6a51bfe9ddee9e790a65983d5a3559514ce8980ef138088c0eb9b2
diff --git a/sys-cluster/legion/legion-16.08.0-r1.ebuild b/sys-cluster/legion/legion-16.08.0-r2.ebuild
index c785d40df28f..7295a5f41e45 100644
--- a/sys-cluster/legion/legion-16.08.0-r1.ebuild
+++ b/sys-cluster/legion/legion-16.08.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,9 @@ IUSE="gasnet +hwloc"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/sys-cluster/legion/legion-16.10.0.ebuild b/sys-cluster/legion/legion-16.10.0-r1.ebuild
index 6ed64ffe46d3..50372479f2c9 100644
--- a/sys-cluster/legion/legion-16.10.0.ebuild
+++ b/sys-cluster/legion/legion-16.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,9 @@ IUSE="gasnet +hwloc"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/sys-cluster/legion/legion-17.02.0.ebuild b/sys-cluster/legion/legion-17.02.0-r1.ebuild
index 415747a8aa60..4ab8ed801e4e 100644
--- a/sys-cluster/legion/legion-17.02.0.ebuild
+++ b/sys-cluster/legion/legion-17.02.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,9 @@ IUSE="gasnet +hwloc"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/sys-cluster/legion/legion-17.05.0.ebuild b/sys-cluster/legion/legion-17.05.0-r1.ebuild
index d54f220af2c9..0746074ce71d 100644
--- a/sys-cluster/legion/legion-17.05.0.ebuild
+++ b/sys-cluster/legion/legion-17.05.0-r1.ebuild
@@ -22,8 +22,9 @@ IUSE="gasnet +hwloc"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/sys-cluster/legion/legion-17.08.0.ebuild b/sys-cluster/legion/legion-17.08.0-r1.ebuild
index b2a4fc2de9c9..c883f98f82d2 100644
--- a/sys-cluster/legion/legion-17.08.0.ebuild
+++ b/sys-cluster/legion/legion-17.08.0-r1.ebuild
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/sys-cluster/legion/legion-17.10.0.ebuild b/sys-cluster/legion/legion-17.10.0-r1.ebuild
index b2a4fc2de9c9..c883f98f82d2 100644
--- a/sys-cluster/legion/legion-17.10.0.ebuild
+++ b/sys-cluster/legion/legion-17.10.0-r1.ebuild
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/sys-cluster/legion/legion-18.02.0.ebuild b/sys-cluster/legion/legion-18.02.0-r1.ebuild
index b2a4fc2de9c9..c883f98f82d2 100644
--- a/sys-cluster/legion/legion-18.02.0.ebuild
+++ b/sys-cluster/legion/legion-18.02.0-r1.ebuild
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( sys-apps/hwloc )
+	hwloc? ( sys-apps/hwloc:= )
 	"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/sys-cluster/legion/legion-18.05.0.ebuild b/sys-cluster/legion/legion-18.05.0-r1.ebuild
index c9eb5be36ea1..bc5ad7cee85d 100644
--- a/sys-cluster/legion/legion-18.05.0.ebuild
+++ b/sys-cluster/legion/legion-18.05.0-r1.ebuild
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( <sys-apps/hwloc-2 )
+	hwloc? ( <sys-apps/hwloc-2:= )
 	"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/sys-cluster/legion/legion-18.12.0-r1.ebuild b/sys-cluster/legion/legion-18.12.0-r1.ebuild
new file mode 100644
index 000000000000..bc5ad7cee85d
--- /dev/null
+++ b/sys-cluster/legion/legion-18.12.0-r1.ebuild
@@ -0,0 +1,41 @@
+# 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.12.0.ebuild b/sys-cluster/legion/legion-18.12.0.ebuild
deleted file mode 100644
index c9eb5be36ea1..000000000000
--- a/sys-cluster/legion/legion-18.12.0.ebuild
+++ /dev/null
@@ -1,40 +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 )
-	"
-
-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
new file mode 100644
index 000000000000..bc5ad7cee85d
--- /dev/null
+++ b/sys-cluster/legion/legion-19.06.0-r1.ebuild
@@ -0,0 +1,41 @@
+# 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.ebuild b/sys-cluster/legion/legion-19.06.0.ebuild
deleted file mode 100644
index c9eb5be36ea1..000000000000
--- a/sys-cluster/legion/legion-19.06.0.ebuild
+++ /dev/null
@@ -1,40 +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 )
-	"
-
-src_configure() {
-	mycmakeargs=(
-		-DLegion_USE_HWLOC=$(usex hwloc)
-		-DLegion_USE_GASNet=$(usex gasnet)
-		-DLegion_ENABLE_TESTING=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-		-DLegion_BUILD_EXAMPLES=ON
-		-DLegion_BUILD_TESTS=ON
-		-DLegion_BUILD_TUTORIAL=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/sys-cluster/legion/legion-9999.ebuild b/sys-cluster/legion/legion-9999.ebuild
index c9eb5be36ea1..bc5ad7cee85d 100644
--- a/sys-cluster/legion/legion-9999.ebuild
+++ b/sys-cluster/legion/legion-9999.ebuild
@@ -23,8 +23,9 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	gasnet? ( >=sys-cluster/gasnet-1.26.4-r1 )
-	hwloc? ( <sys-apps/hwloc-2 )
+	hwloc? ( <sys-apps/hwloc-2:= )
 	"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(