diff --git a/TODO.md b/TODO.md
index 825c543073..3f03834d72 100644
--- a/TODO.md
+++ b/TODO.md
@@ -13,6 +13,11 @@ C
* [parsec](https://bitbucket.org/icldistcomp/parsec)
* [ummunotify](https://github.com/Portals4/ummunotify)
* [retroarch](https://www.retroarch.com/)
+* [argobots](https://www.argobots.org/)
+* [mercury](https://github.com/mercury-hpc/mercury)
+* [mochi-ssg](https://github.com/mochi-hpc/mochi-ssg)
+* [mochi-margo](https://github.com/mochi-hpc/mochi-margo)
+* [mochi-abt-io](https://github.com/mochi-hpc/mochi-abt-io)
C++
* [machinekit](https://github.com/machinekit/machinekit)
@@ -25,7 +30,6 @@ C++
* [opensiv3d](https://github.com/Siv3D/OpenSiv3D)
* [grive2](https://github.com/vitalif/grive2)
* [graph-tool](https://graph-tool.skewed.de/)
-* [nanox](https://github.com/bsc-pm/nanox)
* [mcxx](https://github.com/bsc-pm/mcxx)
* [chapel](https://github.com/chapel-lang/chapel)
* [osmium](https://wiki.openstreetmap.org/wiki/Osmium)
@@ -42,14 +46,17 @@ C++
* [codipack](https://www.scicomp.uni-kl.de/software/codi/)
* [medipack](http://www.scicomp.uni-kl.de/software/medi/)
* [tecio](https://www.tecplot.com/products/tecio-library/)
-* [paraver-kernel](https://github.com/bsc-performance-tools/paraver-kernel)
* [wxparaver](https://github.com/bsc-performance-tools/wxparaver)
* [alpaka](https://github.com/alpaka-group/alpaka)
* [emptyepsilon](https://daid.github.io/EmptyEpsilon/)
+* [mochi-thallium](https://github.com/mochi-hpc/mochi-thallium)
GO
* [open-match](https://github.com/googleforgames/open-match)
+HASKELL
+* [greenclip](https://github.com/erebe/greenclip) (non-bin, source ebuild)
+
JAVA
* [osmosis](https://wiki.openstreetmap.org/wiki/Osmosis)
* [Opensearch](https://github.com/opensearch-project/OpenSearch)
diff --git a/app-vim/apkbuild-vim/Manifest b/app-vim/apkbuild-vim/Manifest
new file mode 100644
index 0000000000..61edeb3f5b
--- /dev/null
+++ b/app-vim/apkbuild-vim/Manifest
@@ -0,0 +1 @@
+DIST apkbuild.vim-423e6948efcbec2d708345ae21d9566cad3ad304.tar.gz 9518 BLAKE2B 0a4b4423f9534167961b55ff220b0fac1230344973a6cf5c97cf448f5abd382373ec9968e1d34ab35ae6242ebe49bfe7b5d3280795a437a0360e033ecd533c32 SHA512 bdfcb871015878e97a77c66dd9fa9a9180d5df2d65a7d9e31a80de07c5e7e7774ddf0367171bda297cb7e59e5d0485cb2241fb9c831cf4c3dc8086049493b564
diff --git a/app-vim/apkbuild-vim/apkbuild-vim-20210723.ebuild b/app-vim/apkbuild-vim/apkbuild-vim-20210723.ebuild
new file mode 100644
index 0000000000..e97c4264d5
--- /dev/null
+++ b/app-vim/apkbuild-vim/apkbuild-vim-20210723.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+MY_PN=${PN/-/.}
+COMMIT="423e6948efcbec2d708345ae21d9566cad3ad304"
+DESCRIPTION="vim plugin: edit and work with APKBUILD files"
+HOMEPAGE="https://gitlab.alpinelinux.org/Leo/apkbuild.vim"
+SRC_URI="https://gitlab.alpinelinux.org/Leo/${MY_PN}/-/archive/${COMMIT}/${MY_PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="apkbuild-vim"
diff --git a/x11-misc/rofi-file-browser-extended/metadata.xml b/app-vim/apkbuild-vim/metadata.xml
similarity index 62%
rename from x11-misc/rofi-file-browser-extended/metadata.xml
rename to app-vim/apkbuild-vim/metadata.xml
index 7a926064dc..c8b0192e7e 100644
--- a/x11-misc/rofi-file-browser-extended/metadata.xml
+++ b/app-vim/apkbuild-vim/metadata.xml
@@ -1,8 +1,8 @@
-
- flow@gentoo.org
- Florian Schmaus
+
+ cyber+gentoo@sysrq.in
+ Anna
diff --git a/app-vim/css-color/Manifest b/app-vim/css-color/Manifest
new file mode 100644
index 0000000000..9b4bbd102e
--- /dev/null
+++ b/app-vim/css-color/Manifest
@@ -0,0 +1 @@
+DIST css-color-20210530.tar.gz 10886 BLAKE2B ac6fe8288c31c3af6a2b1bfdfc84a7805ec9ff876f7eccbbd34a39ac27a6dbe7b2cf42685b8ab34f5a216d25e858e762aa10bf87cb4e2847369f0373e3f8bac0 SHA512 5079e45db09136f8b3cca421dd7398d5df37864307913d0b0ac605ddb1cbe824be67028dc88899e5c5233e8b27b16c150a08309407f5b76dc7abb19b72e5ae68
diff --git a/app-vim/css-color/css-color-20210530.ebuild b/app-vim/css-color/css-color-20210530.ebuild
new file mode 100644
index 0000000000..5bada4cbfc
--- /dev/null
+++ b/app-vim/css-color/css-color-20210530.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT="7337c35588e9027b516f80f03c3b9621a271e168"
+DESCRIPTION="vim plugin: preview colours in source code while editing"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=5056
+https://github.com/ap/vim-css-color"
+SRC_URI="https://github.com/ap/vim-${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${PN}-${COMMIT}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+
+ # avoid collision with other packages
+ cd after/syntax || die
+ for file in *.vim; do
+ mkdir "${file%.vim}" || die
+ mv "${file}" "${file%.vim}/${PN}.vim" || die
+ done
+}
diff --git a/app-vim/css-color/metadata.xml b/app-vim/css-color/metadata.xml
new file mode 100644
index 0000000000..c8b0192e7e
--- /dev/null
+++ b/app-vim/css-color/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/app-vim/gemini-vim/Manifest b/app-vim/gemini-vim/Manifest
new file mode 100644
index 0000000000..0dc944256c
--- /dev/null
+++ b/app-vim/gemini-vim/Manifest
@@ -0,0 +1 @@
+DIST gemini-vim-20210625.tar.gz 13565 BLAKE2B 94482ad07324fc425430a8e9a56c3a6c598090b70589bea670d214cd7ba8c423bc05602c487f96db98cab825e214c8238ff4b5d734831073ff61a43952ea522f SHA512 2e6c48e00a6a28a642c73aa4f910b561a4bfca05ec18dcc2c4184b332f02199477195387c9c30924497e85c03d5e5c5e817b3fa2431c1de29caa7e8a5dfb7ba1
diff --git a/app-vim/gemini-vim/gemini-vim-20210625.ebuild b/app-vim/gemini-vim/gemini-vim-20210625.ebuild
new file mode 100644
index 0000000000..e895c97523
--- /dev/null
+++ b/app-vim/gemini-vim/gemini-vim-20210625.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+MY_PN=${PN/-/.}
+COMMIT="d5d2767dbcfd7ceb8dd53f13162458a824e650c9"
+DESCRIPTION="vim plugin: syntax highlighting for Gemini Text, the text/gemini media type"
+HOMEPAGE="https://sr.ht/~torresjrjr/gemini.vim/"
+SRC_URI="https://git.sr.ht/~torresjrjr/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/gemini-vim/metadata.xml b/app-vim/gemini-vim/metadata.xml
new file mode 100644
index 0000000000..c0764c03f3
--- /dev/null
+++ b/app-vim/gemini-vim/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ mailto:~torresjrjr/public-inbox@list.sr.ht
+
+
diff --git a/app-vim/nerdtree-git/Manifest b/app-vim/nerdtree-git/Manifest
new file mode 100644
index 0000000000..6b137c7b82
--- /dev/null
+++ b/app-vim/nerdtree-git/Manifest
@@ -0,0 +1 @@
+DIST nerdtree-git-20210728.tar.gz 13956 BLAKE2B 3fad11da3bab522e64ef750424cd3910c52587a972cdd612f5d63576282376eb0a0888794c0fd71bc63c8fdcef71a681b0c7a37f0ac27328f5d4c635100ce49d SHA512 d0c2428533ef1ae217c278b8fc9eafba78c16536a1dbcd4cb3503a5ee917ff939d4a52003014878b790a5c6b0b7cb1d26bca54e6f8693325552bdf117d8513f5
diff --git a/app-vim/nerdtree-git/metadata.xml b/app-vim/nerdtree-git/metadata.xml
new file mode 100644
index 0000000000..c8b0192e7e
--- /dev/null
+++ b/app-vim/nerdtree-git/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/app-vim/nerdtree-git/nerdtree-git-20210728.ebuild b/app-vim/nerdtree-git/nerdtree-git-20210728.ebuild
new file mode 100644
index 0000000000..9d7e2afc67
--- /dev/null
+++ b/app-vim/nerdtree-git/nerdtree-git-20210728.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT="ff9b14f14dceecb6c08cb05053ad649c3b6ac250"
+DESCRIPTION="vim plugin: display git status flags in NERDTree"
+HOMEPAGE="https://github.com/Xuyuanp/nerdtree-git-plugin"
+SRC_URI="https://github.com/Xuyuanp/${PN}-plugin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-plugin-${COMMIT}"
+
+LICENSE="WTFPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-vim/nerdtree
+ dev-vcs/git
+"
+BDEPEND="test? (
+ ${RDEPEND}
+ app-vim/themis
+)"
+
+src_test() {
+ themis ./tests --runtimepath "${EPREFIX}"/usr/share/vim/vimfiles || die
+}
+
+src_install() {
+ rm -r tests || die
+ vim-plugin_src_install
+}
diff --git a/app-vim/rainbow/Manifest b/app-vim/rainbow/Manifest
new file mode 100644
index 0000000000..e4db4d297b
--- /dev/null
+++ b/app-vim/rainbow/Manifest
@@ -0,0 +1 @@
+DIST rainbow-3.4.0_p20200528.tar.gz 14901 BLAKE2B c6e5f2ab3fc16fe0cf2e00429027416d516a08ada49fb24207f8f0a410b3b29ffee6f6eab74f8f8f8be6425e28dc61fe52d994dc020b457c10aa0b4524b6ab68 SHA512 e91e0b969d46dc2507cfcdfd8e9ceea26e863ecf2a532b51129744e961c383c24d63e2a213cfffbad22c278d65652aff9c97afcfe6f271ffd60d9a57305a0948
diff --git a/app-vim/rainbow/files/README.gentoo b/app-vim/rainbow/files/README.gentoo
new file mode 100644
index 0000000000..bccf810dda
--- /dev/null
+++ b/app-vim/rainbow/files/README.gentoo
@@ -0,0 +1,8 @@
+CMakeLists.txt syntax highlighting is broken with rainbow enabled.
+Add this to your vimrc to work around the bug:
+
+let g:rainbow_conf = {
+\ 'separately': {
+\ 'cmake': 0,
+\ }
+\}
diff --git a/app-vim/rainbow/metadata.xml b/app-vim/rainbow/metadata.xml
new file mode 100644
index 0000000000..c8b0192e7e
--- /dev/null
+++ b/app-vim/rainbow/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/app-vim/rainbow/rainbow-3.4.0_p20200528.ebuild b/app-vim/rainbow/rainbow-3.4.0_p20200528.ebuild
new file mode 100644
index 0000000000..99ee0ff978
--- /dev/null
+++ b/app-vim/rainbow/rainbow-3.4.0_p20200528.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 vim-plugin
+
+COMMIT="4d15633cdaf61602e1d9fd216a77fc02e0881b2d"
+DESCRIPTION="vim plugin: Rainbow Parentheses Improved"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4176
+https://github.com/luochen1990/rainbow"
+SRC_URI="https://github.com/luochen1990/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="rainbow"
+
+src_install() {
+ rm -r tests || die
+ vim-plugin_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/app-vim/tex-conceal/Manifest b/app-vim/tex-conceal/Manifest
new file mode 100644
index 0000000000..1b3807e28c
--- /dev/null
+++ b/app-vim/tex-conceal/Manifest
@@ -0,0 +1 @@
+DIST tex-conceal-20210409.tar.gz 1104236 BLAKE2B 8a31f0e2de9b10d4c759d937e2bdf347772c49c9aef8148b58cd32a8f6ee2bb420f41dd853d80df0c0294b092019ddcc649a1ec379819db901da5288905e1720 SHA512 07f15a5afbe6a9fa018022f3f24d3d14909ebfb2268c32309fd7992363438e10a86f2e569a55f25eeeda835d2ea123a9591724f2ff0263216a1fa551f4e29aeb
diff --git a/app-vim/tex-conceal/metadata.xml b/app-vim/tex-conceal/metadata.xml
new file mode 100644
index 0000000000..c8b0192e7e
--- /dev/null
+++ b/app-vim/tex-conceal/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/app-vim/tex-conceal/tex-conceal-20210409.ebuild b/app-vim/tex-conceal/tex-conceal-20210409.ebuild
new file mode 100644
index 0000000000..cacec82052
--- /dev/null
+++ b/app-vim/tex-conceal/tex-conceal-20210409.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT="822712d80b4ad5bc5c241ab0a778ede812ec501f"
+DESCRIPTION="vim plugin: extends the Conceal feature for LaTeX"
+HOMEPAGE="https://github.com/KeitaNakamura/tex-conceal.vim"
+SRC_URI="https://github.com/KeitaNakamura/${PN}.vim/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.vim-${COMMIT}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+ rm -r test || die
+
+ # avoid collision with app-vim/vimtex
+ cd after/syntax || die
+ mkdir tex || die
+ mv tex.vim tex/${PN}.vim
+}
diff --git a/app-vim/themis/Manifest b/app-vim/themis/Manifest
new file mode 100644
index 0000000000..d7ceef8ae0
--- /dev/null
+++ b/app-vim/themis/Manifest
@@ -0,0 +1 @@
+DIST themis-1.5.5.tar.gz 54661 BLAKE2B bcd04d5134095c37369188b4e656ac8372a4d5acf351fb5748bb0ec027b2db4f32d26c68018b0691963df400f34ef7b4a39ca84f9400609313b5f61afef6869b SHA512 fc9169215a2213c42db7eb0548dd637ebf06c42ba287a980fa561e8c0f4dea3eee9f4b10c811d4dfebeeacb4bce1aea0d10872eff05b19316d3d4e9774fe6b32
diff --git a/app-vim/themis/metadata.xml b/app-vim/themis/metadata.xml
new file mode 100644
index 0000000000..c8b0192e7e
--- /dev/null
+++ b/app-vim/themis/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/app-vim/themis/themis-1.5.5.ebuild b/app-vim/themis/themis-1.5.5.ebuild
new file mode 100644
index 0000000000..b658992ba6
--- /dev/null
+++ b/app-vim/themis/themis-1.5.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="A testing framework for Vim script"
+HOMEPAGE="https://github.com/thinca/vim-themis"
+SRC_URI="https://github.com/thinca/vim-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${P}"
+
+LICENSE="ZLIB"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="themis"
+
+src_prepare() {
+ default
+
+}
+
+src_test() {
+ bash ./bin/themis || die
+}
+
+src_install() {
+ rm -r examples test || die
+ vim-plugin_src_install
+
+ dosym -r /usr/share/vim/vimfiles/bin/themis /usr/bin/themis
+ fperms +x /usr/share/vim/vimfiles/bin/themis
+}
diff --git a/app-vim/vim-sensible/Manifest b/app-vim/vim-sensible/Manifest
new file mode 100644
index 0000000000..ba5edb75ab
--- /dev/null
+++ b/app-vim/vim-sensible/Manifest
@@ -0,0 +1 @@
+DIST vim-sensible-1.2.tar.gz 3035 BLAKE2B 866745b9f86fd1dae442d0e6ab78c5af068a6a1088b71e2aec51fba113a29c0776e0c650b8933738ba2463a235d4e906810179f9606706e977776e85b667f618 SHA512 d44d4478ce81fcc923e1d7d6d0115125070414526835b46c21b50d1ae2365ff597a1c4b5a725fdfce072f37fd58a7eb60eea7dd25f15ab7544771ca81b32b187
diff --git a/app-vim/vim-sensible/metadata.xml b/app-vim/vim-sensible/metadata.xml
new file mode 100644
index 0000000000..7248be51db
--- /dev/null
+++ b/app-vim/vim-sensible/metadata.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ Think of sensible.vim as one step above 'nocompatible' mode: a universal
+ set of defaults that (hopefully) everyone can agree on.
+
+ * If you're new to Vim, you can install this as a starting point, rather
+ than copying some random vimrc you found.
+
+ * If you're pair programming and you can't agree on whose vimrc to use,
+ this can be your neutral territory.
+
+ * If you're administrating a server with an account that's not
+ exclusively yours, you can `scp` this up to make things a bit more
+ tolerable.
+
+ * If you're troubleshooting a plugin and need to rule out interference
+ from your vimrc, having this installed will ensure you still have some
+ basic amenities.
+
+
diff --git a/app-vim/vim-sensible/vim-sensible-1.2.ebuild b/app-vim/vim-sensible/vim-sensible-1.2.ebuild
new file mode 100644
index 0000000000..8d535e6c66
--- /dev/null
+++ b/app-vim/vim-sensible/vim-sensible-1.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a universal set of defaults that (hopefully) everyone can agree on"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4391
+https://github.com/tpope/vim-sensible"
+SRC_URI="https://github.com/tpope/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-cpp/fbthrift/Manifest b/dev-cpp/fbthrift/Manifest
index a514b10eeb..dcd8c044f5 100644
--- a/dev-cpp/fbthrift/Manifest
+++ b/dev-cpp/fbthrift/Manifest
@@ -1,2 +1 @@
-DIST fbthrift-2021.06.14.00.tar.gz 5642360 BLAKE2B b5d05f9a6555e8b78438e025fd6757471b745aef58c6c8d4e49e8307f08035281f4e66f0d556f7cc3fc1f00609d760f7e724dd74f29b50516a3f7ec1a1d651d5 SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798
-DIST fbthrift-2021.06.28.00.tar.gz 5721750 BLAKE2B 67a60611245c89df070483d64114f7a5f0c9a8778acd260384010e78c1d44c63985ed2f05fecaf3264d93778df319ea2d175da5839821f6243088554e5eeb2dc SHA512 0718f2639a307bed9c492f8347781c4eb0d37a84fed7c9ab55e148fee2feabf81c25dc08c83a35a25aec5433265d5b328ec3e2d322469690d3c03728c202f91e
+DIST fbthrift-2021.08.02.00.tar.gz 5833339 BLAKE2B 647f582396a88ae616162e011bc77c15d4e08d0b511f12684d4b731a2108c370971d7ec52f8ac0c84ff9e94b228e69f4fca29b1ca0747e39bbcf5d58cd491b2a SHA512 a416f9a09a62293fc756d631355787fd0faed639d77986a654610c3fc49344e1f0184d2333c79bd49ac9a450be6d2542317beb512e72d99179206db0cc5e7467
diff --git a/dev-cpp/fbthrift/fbthrift-2021.06.14.00.ebuild b/dev-cpp/fbthrift/fbthrift-2021.06.14.00.ebuild
deleted file mode 100644
index fe7319ed70..0000000000
--- a/dev-cpp/fbthrift/fbthrift-2021.06.14.00.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Facebook's branch of Apache Thrift, including a new C++ server"
-HOMEPAGE="https://github.com/facebook/fbthrift"
-
-SRC_URI="https://github.com/facebook/fbthrift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- app-arch/zstd
- ~dev-cpp/fizz-${PV}:=
- ~dev-cpp/folly-${PV}:=
- dev-cpp/gflags
- dev-cpp/glog
- ~dev-cpp/wangle-${PV}:=
- dev-libs/libfmt
- dev-libs/openssl:0=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/fbthrift/fbthrift-2021.06.28.00.ebuild b/dev-cpp/fbthrift/fbthrift-2021.08.02.00.ebuild
similarity index 100%
rename from dev-cpp/fbthrift/fbthrift-2021.06.28.00.ebuild
rename to dev-cpp/fbthrift/fbthrift-2021.08.02.00.ebuild
diff --git a/dev-cpp/fizz/Manifest b/dev-cpp/fizz/Manifest
index 79fe735f73..8400375e1a 100644
--- a/dev-cpp/fizz/Manifest
+++ b/dev-cpp/fizz/Manifest
@@ -1,2 +1 @@
-DIST fizz-2021.06.14.00.tar.gz 537571 BLAKE2B 2a5782ed37556739351b7492f713d415c15608cc7a85ce773c1eafbb6ecfbcaf7fffe61384dc92a803225d2587e8ff49d6b643038d9e22a38dd98d25a54f6f38 SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de
-DIST fizz-2021.06.28.00.tar.gz 539820 BLAKE2B 862be65dedcf26b2faff8df51b41f650262f221ca8f2d000b4402899db257fec663e6317ac1febe20079513d7a9ea21200f56713499198e6a9e6b6158c5ce054 SHA512 5d160666e6dbe3696b9bd3dbea160406e3bfc21d9a3bd2f33005b57211af4e7fde2f392a981d7c57aecd8db71753d212dd89555652bcd4f8f188a01608eae887
+DIST fizz-2021.08.02.00.tar.gz 540357 BLAKE2B 6edb14ea4b981a7b9fe076570e583c8b875929e63135d4848b1c1a2aa109e1258fd541376bc9346dc229f2dba0e2c346cebb5b486c8a33bcc54f6746ff3de5f0 SHA512 59c734127d9a1dfb7975929f20ae27a11ee3f2a35fb73ef1ba311b347457339a524194459023e2fb038cc7bf688e13beb6391227bec1ecdb12397344e45f051f
diff --git a/dev-cpp/fizz/fizz-2021.06.28.00.ebuild b/dev-cpp/fizz/fizz-2021.06.28.00.ebuild
deleted file mode 100644
index ce8b93c27d..0000000000
--- a/dev-cpp/fizz/fizz-2021.06.28.00.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++14 implementation of the TLS-1.3 standard"
-HOMEPAGE="https://github.com/facebookincubator/fizz"
-
-SRC_URI="https://github.com/facebookincubator/fizz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CMAKE_USE_DIR="${S}/fizz"
-
-RDEPEND="
- ~dev-cpp/folly-${PV}:=
- dev-cpp/gflags
- dev-cpp/glog
- dev-libs/double-conversion
- dev-libs/libevent
- dev-libs/libfmt
- dev-libs/libsodium
- dev-libs/openssl:0=
-"
-#TODO: discover if gtest is linked
-DEPEND="
- ${RDEPEND}
- dev-cpp/gtest
-"
-
-src_prepare() {
- cmake_src_prepare
- sed -i '/Sodium/d' fizz/cmake/fizz-config.cmake.in || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/fizz/fizz-2021.06.14.00.ebuild b/dev-cpp/fizz/fizz-2021.08.02.00.ebuild
similarity index 100%
rename from dev-cpp/fizz/fizz-2021.06.14.00.ebuild
rename to dev-cpp/fizz/fizz-2021.08.02.00.ebuild
diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 185267f730..3b6d47a6ab 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,2 +1 @@
-DIST folly-2021.06.14.00.tar.gz 3392776 BLAKE2B bc0cb6afe3575c69be3094ad6c600fff997974ec70c153aaf632480bf949b91327acd71637b4df40f777ecf11cbddbc89adf4d6553ea5c5f351a08229aa3bf88 SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c
-DIST folly-2021.06.28.00.tar.gz 3425546 BLAKE2B 1ed12c244c4f718bd3718591e9326c2892720ae60d46e338eb196fd64b0dfe32f8fee9afa908eeedfcb1d053c32088db1bb55d3e2a7bf8551ba07d4cd90af25c SHA512 1e915aece4097b70548393b4ede49e565505c930f3af9be3525ca17ed6b18efb75638f4965fe136d9b7ac596b43a936b9db5880dbd8cba2461c1348a5dba1df4
+DIST folly-2021.08.02.00.tar.gz 3469070 BLAKE2B f670746690c3531e573fb01293361808f943de7324bfd4862a10ea9764a41197094e522668e580946244279fa096f7173958cccc57b4f610c7c08ccbf3ec702d SHA512 dbe005f31eeb60e85ef949432de09d7c49a52b19f195c06ef265189a13ad98cbd4b902b59f303c140b7aedc5ff8a604cc9bda9d1d374290561124a729c07149d
diff --git a/dev-cpp/folly/folly-2021.06.28.00.ebuild b/dev-cpp/folly/folly-2021.06.28.00.ebuild
deleted file mode 100644
index 5a76419ee6..0000000000
--- a/dev-cpp/folly/folly-2021.06.28.00.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="An open-source C++ library developed and used at Facebook"
-HOMEPAGE="https://github.com/facebook/folly"
-SRC_URI="https://github.com/facebook/folly/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
- app-arch/lz4
- ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CMAKE_USE_DIR="${S}/wangle"
-
-DEPEND="
- ~dev-cpp/fizz-${PV}:=
- ~dev-cpp/folly-${PV}:=
- dev-cpp/gflags
- dev-cpp/glog
- dev-libs/double-conversion
- dev-libs/libevent
- dev-libs/libfmt
- dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR=$(get_libdir)
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/wangle/wangle-2021.06.14.00.ebuild b/dev-cpp/wangle/wangle-2021.08.02.00.ebuild
similarity index 100%
rename from dev-cpp/wangle/wangle-2021.06.14.00.ebuild
rename to dev-cpp/wangle/wangle-2021.08.02.00.ebuild
diff --git a/dev-libs/cglm/Manifest b/dev-libs/cglm/Manifest
index 0f5c7fae78..78b0abb0ff 100644
--- a/dev-libs/cglm/Manifest
+++ b/dev-libs/cglm/Manifest
@@ -1,2 +1,2 @@
-DIST cglm-0.8.2.tar.gz 231038 BLAKE2B 138a3aec9446e0588b0fc43462f05caf901ac8d03337120e477ec91df2bb0f65aea43921384eeb3d07d63dc4cd8b6ec016d55d6a40ab1e8db4fd6c74131817b9 SHA512 9ed9661f69fc46c7f0fe8468ec7cdf4071118adaa06b97f99134f5d04a0f7b21158df479f678f78e927c6e4a5d2e6f38c2e8d38ef40ab1f04b2b721af3e7a152
DIST cglm-0.8.3.tar.gz 246664 BLAKE2B 70e89d8926b3470c32ef847d2076fb1d8cbce0b0aa726f84c0bcf0207419b3ee7d70f1bfb40b1598827cd74c1b3482d86d0bb4cb3c77c3667ae341829580cca6 SHA512 71062814637e2523b2632980384fa58a639cdc1bbe8b647e7826fe334a53cd880bd5b29baac7d5eaff2bb009a97830c76b239e7273af46908ad7ab52cc8b8173
+DIST cglm-0.8.4.tar.gz 620905 BLAKE2B 9891172bd97c714f81ec931daa82c62d7f2a91008a44b8a49a24cd899bd15b7a5d21c2e7ae322d670336233682435f0f28eab2630891d153b8df5c562478e610 SHA512 507875119eac77cb3f60fe2353cd92b39f50605fdbf68f56d27b7062b7ec6b1cadd868f70c059ebde17adaf4a9167e5082c0151f1af5b0a5e751864a1eca1fa8
diff --git a/dev-libs/cglm/cglm-0.8.2-r1.ebuild b/dev-libs/cglm/cglm-0.8.4.ebuild
similarity index 50%
rename from dev-libs/cglm/cglm-0.8.2-r1.ebuild
rename to dev-libs/cglm/cglm-0.8.4.ebuild
index 6c84b8aea4..6fbdc797cd 100644
--- a/dev-libs/cglm/cglm-0.8.2-r1.ebuild
+++ b/dev-libs/cglm/cglm-0.8.4.ebuild
@@ -3,7 +3,14 @@
EAPI=7
-inherit meson
+DOCS_BUILDER="sphinx"
+DOCS_AUTODOC=0
+DOCS_DIR="${S}/docs/source"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-any-r1
+inherit docs meson
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -18,16 +25,6 @@ HOMEPAGE="https://github.com/recp/cglm"
LICENSE="MIT"
SLOT="0"
-IUSE="doc"
-
-BDEPEND="dev-util/meson
- doc? ( dev-python/sphinx )"
-
-PATCHES=(
- # Upstream patch: https://github.com/recp/cglm/commit/13269f4af8d3c95220f97746c968eac3ba122a32
- "${FILESDIR}"/${PN}-0.8.2-fix-vec3-vec4.patch
-)
-
src_configure() {
local emesonargs=(
"-Dwerror=false"
@@ -38,16 +35,5 @@ src_configure() {
src_compile() {
default
meson_src_compile
- if use doc; then
- einfo "Building documentation ..."
- local doc_dir="${S}/docs"
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
- sphinx-build -b html source build || die "Building documentation failed!"
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${S}/docs/build/." )
- default
- meson_src_install
+ docs_compile
}
diff --git a/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch b/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch
deleted file mode 100644
index 1819ab1a64..0000000000
--- a/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 13269f4af8d3c95220f97746c968eac3ba122a32 Mon Sep 17 00:00:00 2001
-From: winter091
-Date: Sat, 1 May 2021 16:48:31 +0300
-Subject: [PATCH] fix typo: vec3 -> vec4
-
----
- include/cglm/call/vec4.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/cglm/call/vec4.h b/include/cglm/call/vec4.h
-index 28a3734..f56f599 100644
---- a/include/cglm/call/vec4.h
-+++ b/include/cglm/call/vec4.h
-@@ -99,7 +99,7 @@ glmc_vec4_scale(vec4 v, float s, vec4 dest);
-
- CGLM_EXPORT
- void
--glmc_vec4_scale_as(vec3 v, float s, vec3 dest);
-+glmc_vec4_scale_as(vec4 v, float s, vec4 dest);
-
- CGLM_EXPORT
- void
diff --git a/dev-libs/libphonenumber/Manifest b/dev-libs/libphonenumber/Manifest
index 7908dd83f4..9ac03ff7af 100644
--- a/dev-libs/libphonenumber/Manifest
+++ b/dev-libs/libphonenumber/Manifest
@@ -1 +1 @@
-DIST libphonenumber-8.12.29.tar.gz 10991411 BLAKE2B 706e6141e276c9ce3215ceefbbabae5a19801f3e3f8f30fd00600dba5156b95dbc496064db868807b6110767e03229952f6ce7712888e62d92317540a6ac81fe SHA512 1d2b7f84cea45e995452dc18f9f96b1a267c32fda6ee4b1ad8a5741733fd0c3dc23c74f3244f8d8860e46b5ac59412b36d3771fc4d84c2afa6332874645f2441
+DIST libphonenumber-8.12.30.tar.gz 10990809 BLAKE2B 3835ae2b00ac1fe4c45beab39ce6e0a8dec7cf2a94f12c6e721cfd8d4e1833f603291c2a7b902a1a3ba1022609be4f2cfd72a09b5bf8b1b51f4f30ae2ae97df4 SHA512 8e62c4f53fe32bb4a8cacd213f9eea13b45ccc95598bf9e53a579bfd97dd4936d6ba5a919977adee17dd01be4dc3623bdc301354cc14b188a794b6baf3b90dcf
diff --git a/dev-libs/libphonenumber/libphonenumber-8.12.29.ebuild b/dev-libs/libphonenumber/libphonenumber-8.12.30.ebuild
similarity index 100%
rename from dev-libs/libphonenumber/libphonenumber-8.12.29.ebuild
rename to dev-libs/libphonenumber/libphonenumber-8.12.30.ebuild
diff --git a/dev-vcs/lazygit/Manifest b/dev-vcs/lazygit/Manifest
index 2c9b309ce9..28c0f10d31 100644
--- a/dev-vcs/lazygit/Manifest
+++ b/dev-vcs/lazygit/Manifest
@@ -1,3 +1,2 @@
-DIST lazygit-0.27.4.tar.gz 3214405 BLAKE2B 123c2b7ca1bb63fa7d7a40b4c8a56b3f39b651c214ad55179dd07cd81588341589419759207263bbf809da89218e35d2c6185c79bcfd9ee59480ed66d67506dc SHA512 a053d4d3e3458ad33c415a7e9d4286a52b23429babae715afacc61a91185a309d78951cc617ad182cdb59aa53ce48dae9ce38f65c38c8364eaac88d92e478c9d
-DIST lazygit-0.28.1.tar.gz 3222346 BLAKE2B 8cfb3cd59c991cefb3de652c49ef8bb0f94f7f1da6af9fa62e4288383ae14e64644a82fb8ca4d2037fa6b39a54b6b716b9851d42e023ea0a81e2b9d865f6df69 SHA512 8e477216f2f93b3e1d9a5d2c771d05a180e5f193a84afb6d8f93b6fa1d91a7efac89e6e43c5c1c0034c19a19f7e6dada6eed69402cabf5ca2860284fb2c6e232
DIST lazygit-0.28.2.tar.gz 3223174 BLAKE2B 678a44f4109446e7490cc75b4bb2f0195357a8f6dc2539251de7b829b11ef0a7b8d125bb518f7d6822df62bf9922026ba2948d4d6318ca9e18dafcca7ff9792d SHA512 e7002089194c572fffe8329bd245d4db64fb71cb73c63f07b950da845ecdc85c70c8bea682d2b4aa1c9b38f8cf5270cd24d3bb41eff8a26d31be58eddcdf41ce
+DIST lazygit-0.29.tar.gz 3385768 BLAKE2B 4968a45572d85a3af84fc8f459dbab1cfd3a70954c650f16ddd8e937a810b590c974642e94b26614f4b24166b6c4db2fc8dd2538052875d827fdecc8bf8acb18 SHA512 f24d63a01bc64e2704805a20437af7ad0304921c2b4084f64014f9a8d9d9711ef02f4cdcf09ee9955ea5f2ef4f94de58c9ecc55fa7cb05fc59a89c7d8c9237d7
diff --git a/dev-vcs/lazygit/lazygit-0.28.1.ebuild b/dev-vcs/lazygit/lazygit-0.28.1.ebuild
deleted file mode 100644
index 233a104b0c..0000000000
--- a/dev-vcs/lazygit/lazygit-0.28.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/jesseduffield/lazygit"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Lazygit, a simple terminal UI for git commands"
-HOMEPAGE="https://github.com/jesseduffield/lazygit"
-SRC_URI="https://github.com/jesseduffield/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND=( sys-libs/glibc )
-RDEPEND=(
- ${DEPEND}
- dev-vcs/git
-)
-
-DOCS=( src/${EGO_PN}/{CONTRIBUTING,README}.md )
-
-src_compile() {
- GOPATH="${S}" go build -v -o bin/lazygit src/${EGO_PN}/main.go || die
-}
-
-src_install() {
- dobin bin/lazygit
-
- use doc && dodoc -r "src/${EGO_PN}/docs/."
- einstalldocs
-}
diff --git a/dev-vcs/lazygit/lazygit-0.27.4.ebuild b/dev-vcs/lazygit/lazygit-0.29.ebuild
similarity index 100%
rename from dev-vcs/lazygit/lazygit-0.27.4.ebuild
rename to dev-vcs/lazygit/lazygit-0.29.ebuild
diff --git a/games-fps/crispy-doom/Manifest b/games-fps/crispy-doom/Manifest
index c2200f0277..7654c34cde 100644
--- a/games-fps/crispy-doom/Manifest
+++ b/games-fps/crispy-doom/Manifest
@@ -1,3 +1,4 @@
DIST crispy-doom-5.10.0.tar.gz 2640909 BLAKE2B 67112cdb0b8a4caa1de9fc3fcd752be8775d154a5df194941bd1a024f607c9b7f0925994ed236a6e8f9579910af8dd29585f9fce77f72a1c20ab66177f7bca4d SHA512 b289939af35bbe3a933827fe834cbff8a267b6280749b27084abdf25174042bbdcaca313359258d7ab3fecacedd9b0f06b92624f2a7599ffff37a5e0db2436b1
DIST crispy-doom-5.10.1.tar.gz 2649358 BLAKE2B 920df67f123218d737de1a1b147d96090a8ebb6021e4b532f30430441c8dcb4ef069e7045381a8ce8e8754d49a9595efa4d4700d4c3986728b9e2edfdc3d6c66 SHA512 134354c6692151902bd7f5349a88d5899e88f1f8e55499cb15f600c2c6cd0f89fa83dc17a26313b903bb801bd807ee1b5616d3cd5c7bda7e5d8e608a59194681
DIST crispy-doom-5.10.2.tar.gz 2648117 BLAKE2B 2a502dca71418a9358c474801e175b510f7fcbf1453df6a061d20439e79c642881ad6166c0788840e4f8c64f70c6ea95d1a97bbab7c83e0f4d3c2af8296a64dd SHA512 a1ee20510608bb889236288b30eb5d84b841c267b0907f5155497d3824021b9490365bc29e83a3e59c0519eaab35802aea71935e82b4f7a09b7b07fd933a296b
+DIST crispy-doom-5.10.3.tar.gz 2648144 BLAKE2B 050f6e28c5db73d6f11539bee7e1de7a390fa6f3169d4bbede698b736523b9a0255cba3f67ec99653fef4925843c5e107200bed981bb0db96ff1373434ffb134 SHA512 f98d8cbfb748bccca1ef50d9d46355d5b6f6dfa44b271803193f3e41e48c28fa8c6ad5bbe3a7a4ae36585cc150f2acad7ad5bd4b7a411faf45b234455d83d651
diff --git a/games-fps/crispy-doom/crispy-doom-5.10.3.ebuild b/games-fps/crispy-doom/crispy-doom-5.10.3.ebuild
new file mode 100644
index 0000000000..506534c2e5
--- /dev/null
+++ b/games-fps/crispy-doom/crispy-doom-5.10.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools prefix python-any-r1 xdg
+
+DESCRIPTION="A limit-removing enhanced-resolution Doom source port based on Chocolate Doom"
+HOMEPAGE="https://github.com/fabiangreffrath/crispy-doom"
+SRC_URI="https://github.com/fabiangreffrath/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libsamplerate +midi png truecolor vorbis zlib"
+
+DEPEND="
+ media-libs/libsdl2[video]
+ media-libs/sdl2-mixer[midi?,vorbis?]
+ media-libs/sdl2-net
+ libsamplerate? ( media-libs/libsamplerate )
+ png? ( media-libs/libpng:= )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+# ${PYTHON_DEPS} for bash-completion
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? ( ${PYTHON_DEPS} )"
+
+S="${WORKDIR}"/${PN}-${P}
+
+DOCS=(
+ "AUTHORS"
+ "ChangeLog"
+ "NEWS.md"
+ "NOT-BUGS.md"
+ "PHILOSOPHY.md"
+ "README.md"
+ "README.Music.md"
+ "README.Strife.md"
+)
+
+src_prepare() {
+ default
+
+ hprefixify src/d_iwad.c
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-bash-completion \
+ $(use_enable doc) \
+ --disable-fonts \
+ --disable-icons \
+ $(use_with libsamplerate) \
+ $(use_with png libpng) \
+ $(use_enable truecolor) \
+ $(use_with zlib)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Remove redundant documentation files
+ rm -r "${ED}/usr/share/doc/"* || die
+
+ einstalldocs
+}
diff --git a/net-im/guilded-bin/Manifest b/net-im/guilded-bin/Manifest
index 1edc321583..fcea5f340d 100644
--- a/net-im/guilded-bin/Manifest
+++ b/net-im/guilded-bin/Manifest
@@ -1 +1 @@
-DIST Guilded-Linux.deb 66382392 BLAKE2B 457a3b1f053e51a5b434e5fb076a9d6e6ab771f78ac0adbd2ecc272e2f8bd378db9e838f90243bb0b054fee74252f849ea7d665b25f3acd9fb927846ee3171ab SHA512 d14f510f2a38dc566de37d20f148576104fe144637c192afdd0062d90324e9e295b3874006e38c6f80a13c4c404e87c446222b417a3d5938cd16fd574f815a19
+DIST guilded-bin-1.0.9105465.deb 66776582 BLAKE2B 230b87ecb5062182764f316837d42ed17a1d8b55009f98ae515b2ba6d90f0f3773427445b6f4dbe437f0d685d77399d6855e0fc2b01ca51ad359bdb62c996d92 SHA512 47a4210ab5d3b69829853a33997d934b95315a0b6bab4683ab37baa67df5b642b71b4d5e7805362022ceafcba3ab9493a73a0a498e18ebc61bc97a2384a9ae57
diff --git a/net-im/guilded-bin/guilded-bin-1.0.9101267.ebuild b/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild
similarity index 95%
rename from net-im/guilded-bin/guilded-bin-1.0.9101267.ebuild
rename to net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild
index 41660ddccf..cabbb5efa3 100644
--- a/net-im/guilded-bin/guilded-bin-1.0.9101267.ebuild
+++ b/net-im/guilded-bin/guilded-bin-1.0.9105465.ebuild
@@ -10,7 +10,7 @@ inherit desktop linux-info pax-utils unpacker xdg
DESCRIPTION="Drop Discord, get Guilded"
HOMEPAGE="https://www.guilded.gg"
-SRC_URI="https://www.guilded.gg/downloads/${MY_BIN}-Linux.deb"
+SRC_URI="https://www.guilded.gg/downloads/${MY_BIN}-Linux.deb -> ${P}.deb"
LICENSE="all-rights-reserved"
SLOT="0"
diff --git a/net-misc/can-utils/Manifest b/net-misc/can-utils/Manifest
index d6ff0f2201..cea2fb6568 100644
--- a/net-misc/can-utils/Manifest
+++ b/net-misc/can-utils/Manifest
@@ -1,2 +1,3 @@
DIST can-utils-2020.02.04.tar.gz 121866 BLAKE2B 64a9e0dbc2e65ef01b6709fc608daecce53592f98c002a46b15a282fff33f52d1d7b34d22ed85f1e2a2eb8a7be6e5ce69a85ba4e2ba19f251994f5022697f474 SHA512 5f12a84b82564da5a47e6dc906bf26f0e56db77ce367b5b72a2820cf18447d78a355d0173c678e33dc0e4cc07ef3a12b3a84d6b016c7ee0b1ac5a7f10daee1c8
DIST can-utils-2020.12.0.tar.gz 132010 BLAKE2B 626c0b88973c0579728869013f48ec7de4bcd94dd98ed4ae8349a0b71ec2eb9892d267501ff7af58b34ac528f2d6e733aad795582bcc96b03d20ae0710986ea8 SHA512 b9d92b7734611deaf445708aabf4f46f7cf3ad88f46618fbae6821d308b2950da014420b194792e4d2458f396bd85f200a8d10112c10191a98624073b8502c19
+DIST can-utils-2021.08.0.tar.gz 148133 BLAKE2B 591221990aeb2aebb73f4288dba80fa32c65b8c592aa35ccc9cfbd0a8e6a30beb4f5d838811ffd96eba393a7cd3d3fa2aee8ca7378c9c27c694a89da7e9e6ec4 SHA512 367dc19fc653abda0cd6f843f51487f0c538d691542a1a7f5acb87a82b72efb0da5351568de87cd7d3894eaa53b7271e56d8cb66fa2f55079ed0bb1e015dcd99
diff --git a/net-misc/can-utils/can-utils-2021.08.0.ebuild b/net-misc/can-utils/can-utils-2021.08.0.ebuild
new file mode 100644
index 0000000000..2dafd58711
--- /dev/null
+++ b/net-misc/can-utils/can-utils-2021.08.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="SocketCAN userspace utilities and tools"
+HOMEPAGE="https://github.com/linux-can/can-utils"
+SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+# Default src_install + newconfd and newinitd
+src_install() {
+
+ emake DESTDIR="${D}" install
+
+ einstalldocs
+
+ systemd_dounit "${FILESDIR}/slcan.service"
+ systemd_install_serviced "${FILESDIR}/slcan.service.conf"
+ newconfd "${FILESDIR}/slcand.confd" slcand
+ newinitd "${FILESDIR}/slcand.initd" slcand
+}
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 2a9b57fb21..fecb19aa98 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -31,3 +31,9 @@ sys-cluster/extrae openshmem
# petit gui doesn't build
# https://github.com/davewathaverford/the-omega-project/issues/5
sci-mathematics/the-omega-project gui
+
+# Alessandro Barbieri (2021-08-18)
+# build failure
+# https://github.com/bsc-pm/nanox/issues/18
+sys-cluster/nanox gasnet
+
diff --git a/sys-cluster/TCL/TCL-1.0.ebuild b/sys-cluster/TCL/TCL-1.0.ebuild
index a09aeaf0eb..b4eb7020d0 100644
--- a/sys-cluster/TCL/TCL-1.0.ebuild
+++ b/sys-cluster/TCL/TCL-1.0.ebuild
@@ -12,7 +12,13 @@ SRC_URI="https://github.com/bsc-pm/TCL/archive/refs/tags/v${PV}.tar.gz -> ${P}.t
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="debug fti instrumentation scr veloc"
+IUSE_TCL="
+ tcl-debug
+ tcl-instrumentation
+ tcl-instrumentation-debug
+"
+USE_EXPAND="TCL"
+IUSE="${IUSE_TCL} fti scr veloc"
RDEPEND="
virtual/mpi
@@ -22,7 +28,11 @@ RDEPEND="
veloc? ( sys-cluster/veloc )
"
DEPEND="${RDEPEND}"
-REQUIRED_USE="|| ( fti scr veloc )"
+
+REQUIRED_USE="
+ || ( fti scr veloc )
+ || ( ${IUSE_TCL//+/} )
+"
src_prepare() {
default
@@ -36,15 +46,11 @@ src_configure() {
--includedir="${EPREFIX}/usr/include/TCL"
--with-mpi="${EPREFIX}/usr"
- $(use_enable debug)
- $(use_enable instrumentation)
+ $(use_enable tcl-debug debug)
+ $(use_enable tcl-instrumentation instrumentation)
+ $(use_enable tcl-instrumentation-debug instrumentation-debug)
)
- if use debug && use instrumentation; then
- myconf+=( "--enable-instrumentation-debug" )
- else
- myconf+=( "--disable-instrumentation-debug" )
- fi
if use fti; then
myconf+=( "--with-fti=${EPREFIX}/usr" )
else
diff --git a/sys-cluster/TCL/metadata.xml b/sys-cluster/TCL/metadata.xml
index c3967643fc..14a2d4da22 100644
--- a/sys-cluster/TCL/metadata.xml
+++ b/sys-cluster/TCL/metadata.xml
@@ -11,8 +11,10 @@
diff --git a/sys-cluster/extrae/extrae-3.8.3-r9.ebuild b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
similarity index 89%
rename from sys-cluster/extrae/extrae-3.8.3-r9.ebuild
rename to sys-cluster/extrae/extrae-3.8.3-r10.ebuild
index c52ea919cd..e37da75a2b 100644
--- a/sys-cluster/extrae/extrae-3.8.3-r9.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
@@ -14,28 +14,33 @@ SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz ->
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="clustering doc dyninst heterogeneous inotify +instrument-dynamic-memory +instrument-io
-+instrument-syscall memkind merge-in-trace nanos online opencl openmp openshmem
-+parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss
-spectral +xml"
+
+IUSE_INSTRUMENT="
+ +instrument-dynamic-memory
+ +instrument-io
+ +instrument-syscall
+"
+IUSE_EXPAND="INSTRUMENT"
+IUSE="${IUSE_INSTRUMENT} clustering dlsym doc dyninst heterogeneous inotify memkind
+merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling
+peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml"
#aspectj and aspectj-weaver need to both be enabled at the same time
#current dev-java/aspectj package only provides aspectj.jar
#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc
#aspectj-weaver needs bar/aspectjweaver.jar
-#TODO: pmapi cuda cupti gm mx aspectj
+#TODO: cuda cupti gm mx
#TODO: support llvm libunwind, llvm rt, elftoolchain
CDEPEND="
${PYTHON_DEPS}
dev-libs/libxml2
dev-libs/papi
- !=sys-cluster/openmpi-4.0.5-r1[libompitrace]
+ !sys-cluster/openmpi[libompitrace(+)]
+ sys-libs/libunwind
sys-libs/zlib
virtual/mpi
- || ( sys-libs/libunwind sys-libs/llvm-libunwind )
|| ( sys-devel/binutils:* sys-libs/binutils-libs )
clustering? ( sys-cluster/clusteringsuite[treedbscan] )
@@ -50,6 +55,7 @@ CDEPEND="
online? ( sys-cluster/synapse )
opencl? ( dev-util/opencl-headers )
openshmem? ( sys-cluster/SOS )
+ peruse? ( sys-cluster/openmpi[peruse(-)] )
sionlib? ( sys-cluster/sionlib:= )
spectral? (
sci-libs/fftw
@@ -74,8 +80,12 @@ BDEPEND="
dev-texlive/texlive-latexextra
)
"
+
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
+
+ || ( ${IUSE_INSTRUMENT//+/} )
+
java? ( pthread )
"
# cupti? ( cuda )
@@ -94,8 +104,6 @@ src_configure() {
--datarootdir="${T}"
--disable-mic
- --disable-online
- --disable-peruse
--disable-pmapi
--disable-static
@@ -104,7 +112,6 @@ src_configure() {
--with-librt="${EPREFIX}/usr"
--with-mpi="${EPREFIX}/usr"
--with-papi="${EPREFIX}/usr"
- --with-pic
--with-unwind="${EPREFIX}/usr"
--without-cupti
@@ -121,16 +128,18 @@ src_configure() {
$(use_enable nanos)
$(use_enable online)
$(use_enable openmp)
- $(use_enable sampling)
$(use_enable parallel-merge)
$(use_enable pebs-sampling)
+ $(use_enable peruse)
$(use_enable posix-clock)
$(use_enable pthread)
+ $(use_enable sampling)
$(use_enable single-mpi-lib)
$(use_enable smpss)
$(use_enable xml)
)
-#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi))
+
+ use dlsym && myconf+=( "--with-pmpi-hook=dlsym" )
# if use aspectj; then
# myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" )
diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml
index ba115eca51..9e8da6d6f0 100644
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -21,7 +21,8 @@ process). Extrae generates trace files that can be later visualized with sys-clu
Generates the documentation of this instrumentation package
- Build with dyninst
+ Use dlsym instead of PMPI
+ Build with sys-cluster/dyninst
Enable support for heterogeneous tracing
Enable inotify support
Enables instrumentation for dynamic memory (malloc, free, realloc) calls
@@ -37,11 +38,11 @@ process). Extrae generates trace files that can be later visualized with sys-clu
OpenSHMEM to be used for the instrumentation package
Build the parallel mergers (mpimpi2prv/mpimpi2dim) based on MPI
enable PEBS sampling
-
+ Enable gathering information with PerUse
Use POSIX clock (clock_gettime call) instead of low level timing routines. Use this option if the system where you install the instrumentation package modifies the frequency of its processors at runtime.
Enable support for tracing pthread library
- Enable PAPI sampling support
- This package enables support for on-line spectral analysis.
+ Enable dev-libs/papi sampling support
+ This package enables support for on-line sys-cluster/spectral analysis.
Produces a single instrumentation library for MPI that contains both Fortran and C wrappers. Applications that call the MPI library from both C and Fortran languages need this flag to be enabled.
Enable support for sys-cluster/sionlib
Enable support for tracing SMP-superscalar
diff --git a/sys-cluster/libyogrt/libyogrt-1.24.ebuild b/sys-cluster/libyogrt/libyogrt-1.24.ebuild
index a2e48b40d9..001d2104b5 100644
--- a/sys-cluster/libyogrt/libyogrt-1.24.ebuild
+++ b/sys-cluster/libyogrt/libyogrt-1.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LLNL/libyogrt/archive/refs/tags/${PV}.tar.gz -> ${P}
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="slurm" #lsf moab lcrm
+IUSE="slurm"
RDEPEND="slurm? ( sys-cluster/slurm )"
DEPEND="${RDEPEND}"
diff --git a/sys-cluster/nanox/Manifest b/sys-cluster/nanox/Manifest
new file mode 100644
index 0000000000..e7287fb88d
--- /dev/null
+++ b/sys-cluster/nanox/Manifest
@@ -0,0 +1 @@
+DIST nanox-0.15_p20210818.tar.gz 1185402 BLAKE2B e390f1780d6f2c68e08cf8784bfb37da777e86b2790dc056f79fefd68b36e7b321b2fb865137e4fe7d5c2d10e7b094cf0abdcb3e65c0122c6e38b81de39d9a4a SHA512 7cc897291a050588a9b0e9b5a42fff2e75baf6ac6a2ca9dabb6ad7a38eeb5f3d9542cc4052b3cdd812e8ce45d2f1d5409216f690c8c6fae55aa13859dfa328e6
diff --git a/sys-cluster/nanox/files/nanox-no-Werror.patch b/sys-cluster/nanox/files/nanox-no-Werror.patch
new file mode 100644
index 0000000000..e9ec847c47
--- /dev/null
+++ b/sys-cluster/nanox/files/nanox-no-Werror.patch
@@ -0,0 +1,11 @@
+--- a/m4/ax_config_cc.m4
++++ b/m4/ax_config_cc.m4
+@@ -71,7 +71,7 @@
+ # Default: use -include flag
+ cc_dep_CPPFLAGS="-include \"config.h\" -include \"nanox-config.h\""
+ cc_dep_CXXFLAGS="-include \"new_decl.hpp\""
+- AX_APPEND_FLAG([-Wall -Wextra -Wshadow -Wmissing-declarations -Wno-unused-parameter -Wno-missing-field-initializers -Werror],[cc_dep_CXXFLAGS])
++ AX_APPEND_FLAG([-Wall -Wextra -Wshadow -Wmissing-declarations -Wno-unused-parameter -Wno-missing-field-initializers],[cc_dep_CXXFLAGS])
+ no_inline_flag=-fno-inline
+ ])
+
diff --git a/sys-cluster/nanox/metadata.xml b/sys-cluster/nanox/metadata.xml
new file mode 100644
index 0000000000..d1592a53aa
--- /dev/null
+++ b/sys-cluster/nanox/metadata.xml
@@ -0,0 +1,39 @@
+
+
+
+
+Nanos++ is a parallel runtime library aimed at fast prototyping developed by the Programming Models group at the Barcelona Supercomputing Center.
+Nanos++ is mainly used together with the Mercurium compiler to implement the OmpSs programming model (an extension to the OpenMP programming model based only in tasks). Both tools also implement OpenMP 3.1 features and include some additional extensions (some of them also introduced in following OpenMP releases).
+The runtime provides several services to support task parallelism using a synchronization mechanism based on data-dependencies. Data parallelism is also supported by means of services mapped on top of its task support. Task are implemented as user-level threads when possible (currently x86, x86-64, ia64, arm, aarch64, ppc32 and ppc64 are supported). It also provides support for maintaining coherence across different address spaces (such as with GPUs or cluster nodes) by means of a directory/cache mechanism.
+The main purpose of Nanos++ RTL is to be used in research of parallel programming environments. Our aim has been to enable easy development of different parts of the runtime so researchers have a platform that allows them to try different mechanisms. As such it is designed to be extensible by means of plugins. The scheduling policy, the throttling policy, the dependence approach, the barrier implementations, slicers and worksharing mechanisms, the instrumentation layer and the architectural dependant level are examples of plugins that developers may easily implement using Nanos++. This extensibility does not come for free. The runtime overheads are slightly increased, but there should be low enough for results to be meaningful except for cases of extreme-fine grain applications.
+
+
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ https://github.com/bsc-pm/nanox/issues
+ bsc-pm/nanox
+
+
+
diff --git a/sys-cluster/nanox/nanox-0.15_p20210818.ebuild b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
new file mode 100644
index 0000000000..ba9306b7da
--- /dev/null
+++ b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="a9df6936128ebe10374350c719a0fba74bc89803"
+DOCS_BUILDER="doxygen"
+DOCS_CONFIG_NAME="doxy-nanox"
+DOCS_DIR="doc"
+
+inherit autotools docs
+
+DESCRIPTION="Nanos++ is a runtime designed to serve as runtime support in parallel environments"
+HOMEPAGE="
+ https://pm.bsc.es/nanox
+ https://github.com/bsc-pm/nanox
+"
+SRC_URI="https://github.com/bsc-pm/nanox/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE_NANOX="
+ nanox-debug
+ +nanox-instrumentation
+ nanox-instrumentation-debug
+ +nanox-performance
+"
+IUSE_EXPAND="NANOX"
+IUSE="${IUSE_NANOX} allocator ayudame dlb +extrae gasnet hwloc memkind memtracker mpi opencl papi sqlite resiliency task-callback +threads"
+
+CDEPEND="
+ ayudame? ( sys-cluster/temanejo[-ompss] )
+ dlb? ( sys-cluster/dlb )
+ extrae? ( sys-cluster/extrae[nanos] )
+ gasnet? ( sys-cluster/gasnet )
+ hwloc? ( sys-apps/hwloc )
+ memkind? ( dev-libs/memkind )
+ mpi? ( virtual/mpi )
+ papi? ( dev-libs/papi )
+ sqlite? ( dev-db/sqlite )
+"
+RDEPEND="
+ ${CDEPEND}
+ opencl? ( virtual/opencl )
+"
+DEPEND="
+ ${CDEPEND}
+ opencl? ( dev-util/opencl-headers )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-no-Werror.patch" )
+REQUIRED_USE="
+ || ( ${IUSE_NANOX//+/} )
+ nanox-instrumentation? ( extrae )
+ nanox-instrumentation-debug? ( extrae )
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ use opencl && addwrite /dev/dri/
+ use opencl && addwrite /var/lib/portage/home/.cache #mesa shader cache
+
+ local myconf=(
+ --disable-static
+ --enable-gcc-new-atomic-builtins
+ --enable-performance
+ --enable-shared
+ --without-cellsdk
+ --without-chapel
+ --without-cuda
+ --without-mcc
+ --without-nextsim
+ --without-xdma
+
+ $(use_enable allocator)
+ $(use_enable memtracker)
+ $(use_enable nanox-debug debug)
+ $(use_enable nanox-instrumentation instrumentation)
+ $(use_enable nanox-instrumentation-debug instrumentation-debug)
+ $(use_enable nanox-performance performance)
+ $(use_enable resiliency)
+ $(use_enable task-callback)
+ $(use_enable threads ult)
+
+ $(use_with opencl)
+ )
+
+ if use ayudame; then
+ myconf+=( "--with-ayudame=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-ayudame" )
+ fi
+ if use dlb; then
+ myconf+=( "--with-dlb=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-dlb" )
+ fi
+ if use extrae; then
+ myconf+=( "--with-extrae=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-extrae" )
+ fi
+ if use gasnet; then
+ myconf+=( "--with-gasnet=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-gasnet" )
+ fi
+ if use hwloc; then
+ myconf+=( "--with-hwloc=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-hwloc" )
+ fi
+ if use memkind; then
+ myconf+=( "--with-memkind=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-memkind" )
+ fi
+ if use mpi; then
+ myconf+=( "--with-mpi=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-mpi" )
+ fi
+ if use papi; then
+ myconf+=( "--with-papi=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-papi" )
+ fi
+ if use sqlite; then
+ myconf+=( "--with-sqlite3=${EPREFIX}/usr" )
+ else
+ myconf+=( "--without-sqlite3" )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+ docs_compile
+}
+
+src_install() {
+ default
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-cluster/paraver-kernel/Manifest b/sys-cluster/paraver-kernel/Manifest
new file mode 100644
index 0000000000..db4733fe46
--- /dev/null
+++ b/sys-cluster/paraver-kernel/Manifest
@@ -0,0 +1 @@
+DIST paraver-kernel-4.9.0.tar.gz 2144621 BLAKE2B 93cb6a751462ff0f39261e89fba11664ac07ff20f557e41a899cf958fa5bc7751bca5fc7d1bb3c734cb3ba60e84e7c113ed86641e985a807814b0be039a943ac SHA512 efd781c2288e4b7ce847d6010fd79b83c9db32f5f9b4696009feaa56558aa1f20f86955e920dec6a6355377fe4cf09f9ed23caa55e63596dc0ebb289933cc149
diff --git a/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch b/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
new file mode 100644
index 0000000000..a007d1b357
--- /dev/null
+++ b/sys-cluster/paraver-kernel/files/paraver-kernel-4.9.0-fix-gcc-11-compilation-error.patch
@@ -0,0 +1,20 @@
+From 6ed43d980aba622e27402efdaaf32591fcb72b02 Mon Sep 17 00:00:00 2001
+From: Eloy Martinez
+Date: Wed, 30 Jun 2021 11:27:15 +0200
+Subject: [PATCH] Fixed GCC 11 compilation error
+
+---
+ api/recordlist.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/api/recordlist.h
++++ b/api/recordlist.h
+@@ -142,7 +142,7 @@ struct RLRecord
+ // r1 is less than r2?
+ struct ltrecord
+ {
+- bool operator()( const RLRecord& r1, const RLRecord& r2 )
++ bool operator()( const RLRecord& r1, const RLRecord& r2 ) const
+ {
+ if ( r1.getTime() < r2.getTime() )
+ return true;
diff --git a/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch b/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch
new file mode 100644
index 0000000000..f760dd06a7
--- /dev/null
+++ b/sys-cluster/paraver-kernel/files/paraver-kernel-unbundle-libbsctools.patch
@@ -0,0 +1,264 @@
+--- a/api/eventlabels.cpp
++++ b/api/eventlabels.cpp
+@@ -24,11 +24,6 @@
+
+ #include "eventlabels.h"
+
+-#ifdef OLD_PCFPARSER
+-#include "utils/pcfparser/old/ParaverEventType.h"
+-#include "utils/pcfparser/old/ParaverEventValue.h"
+-#endif
+-
+ using namespace std;
+
+ const string EventLabels::unknownLabel = "Unknown";
+--- a/api/eventlabels.h
++++ b/api/eventlabels.h
+@@ -29,11 +29,7 @@
+ #include