Merge updates from master

2026-07-17 11:04:10 -04:00 · 2021-08-07 18:06:45 +00:00
parent 03bf5c3aac dbda197ace
commit d85f23c3d5
49 changed files with 1127 additions and 157 deletions
--- a/TODO.md
+++ b/TODO.md
@@ -12,7 +12,6 @@ C
 * [hpmpc](https://github.com/giaf/hpmpc)
 * [parsec](https://bitbucket.org/icldistcomp/parsec)
 * [the-omega-project](https://github.com/davewathaverford/the-omega-project)
-* [sandia openshmem](https://github.com/Sandia-OpenSHMEM/SOS)
 * [ummunotify](https://github.com/Portals4/ummunotify)

 C++
--- a/acct-group/gemini/gemini-0.ebuild
+++ b/acct-group/gemini/gemini-0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit acct-group

-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"

 ACCT_GROUP_ID=-1
--- a/acct-user/gemini/gemini-0.ebuild
+++ b/acct-user/gemini/gemini-0.ebuild
@@ -1,12 +1,11 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit acct-user

-DESCRIPTION="User for gemini daemon"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~x86"

 ACCT_USER_ID=-1
 ACCT_USER_GROUPS=( gemini )
--- a/app-admin/akita/Manifest
+++ b/app-admin/akita/Manifest
@@ -0,0 +1 @@
+DIST akita-0.1.4.tar.gz 212866 BLAKE2B d6a32943eff8eb110fd4026378ecf04443a0792386ad755e28efeeba983f501f735bdae93bf798413caddec30764c9b6a2521d605e88f84a15081994361ce3ad SHA512 aeb5f6c21b4cb69c9adf58516db6ad951db562f5a12ff71f3816b9a962c4c2503120f6140f53b82893c441565676f3bc41a19ea2301728502d5a2c191372fdba
--- a/app-admin/akita/akita-0.1.4.ebuild
+++ b/app-admin/akita/akita-0.1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="An HTTP log monitoring tool for your terminal"
+HOMEPAGE="https://github.com/michael-lazar/Akita https://pypi.org/project/akita/"
+SRC_URI="https://github.com/michael-lazar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Akita-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
--- a/app-admin/akita/metadata.xml
+++ b/app-admin/akita/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<longdescription>
+		Akita is a local HTTP log monitoring tool that runs in your
+		terminal. With Akita, you can view a summary of you webserver's
+		activity in real-time. All server access logs that use the
+		Common Log Format are supported, including Apache and Nginx.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>lazar.michael22@gmail.com</email>
+			<name>Michael Lazar</name>
+		</maintainer>
+		<remote-id type="github">michael-lazar/Akita</remote-id>
+		<remote-id type="pypi">akita</remote-id>
+		<bugs-to>https://github.com/michael-lazar/Akita/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
--- a/app-doc/anarchism/Manifest
+++ b/app-doc/anarchism/Manifest
@@ -0,0 +1 @@
+DIST anarchism-15.3.tar.gz 8160295 BLAKE2B 522a2314e6c208a258104412b7620061f952c1a969a11a432cc14bc1a7037d89e0953e82033a9811d461831f9f30c9d0e1924b94e3b8e7deb33e44578ce3f80b SHA512 e0df7ddb8b042eceebf701ec7f8ff9344dc8abefbf2d13f9cf6615c06ff1250f0398ecc281f7c9e77ca49a15f86f04dfdd2f8ad50dc2062223df1c4231736046
--- a/app-doc/anarchism/anarchism-15.3.ebuild
+++ b/app-doc/anarchism/anarchism-15.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DEBIAN_VERSION="${PV}-3"
+
+DESCRIPTION="An anarchist FAQ"
+HOMEPAGE="http://www.anarchistfaq.org/afaq/index.html"
+SRC_URI="https://salsa.debian.org/debian/anarchism/-/archive/debian/${DEBIAN_VERSION}/anarchism-debian-${DEBIAN_VERSION}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-debian-${DEBIAN_VERSION}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_prepare() {
+	sed -Ei "s|file://(/usr/share/doc/)anarchism|file://${EPREFIX}\1${P}|" \
+		debian/anarchism.desktop || die
+
+	default
+}
+
+src_install() {
+	dodoc -r html markdown README.md
+	domenu debian/anarchism.desktop
+	doicon debian/anarchism.svg
+}
+
+pkg_postinst() {
+	elog "If you wish to symlink the index, the path is /usr/share/doc/anarchism-${PV}/html/index.html"
+	elog "For example:"
+	elog "ln -s /usr/share/doc/anarchism-${PV}/html/index.html ~/Desktop/Anarchist\\ FAQ.html"
+}
--- a/app-doc/anarchism/metadata.xml
+++ b/app-doc/anarchism/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<longdescription lang="en">
+		The aim of the anarchist FAQ is to present what anarchism really stands
+		for and indicate why you should become an anarchist.
+	</longdescription>
+	<upstream>
+	<bugs-to>https://0xacab.org/ju/afaq/-/issues</bugs-to>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
--- a/app-misc/apidb/Manifest
+++ b/app-misc/apidb/Manifest
@@ -1,2 +1,3 @@
 DIST 5.11.0-beta.tar.gz 193852 BLAKE2B 522e691afdf97dde0d34982938d1443156057d30b46a2f705881dd76f5ff739dcc2c2b01a4aef8f0edf59d51259bc6a88760a9cee31fbbada622e6da7ad37718 SHA512 42955f30f79c8eb22a18b95aae480ca43ba2de95f0cd5db2a69851b1e3098927a9ef28c8a7ef4ae136d424821c5a6f8ca9f91893161baeca75236683df95d6be
+DIST 5.13.1-beta.tar.gz 190519 BLAKE2B 0fb809e50d28163559e9d633e4b5f58f3111fadf3992071515e61b97709f2925c11e498978739115d20907fe5eb5d9755929d3fa582d9300b69bccefc493d199 SHA512 11d5999faf1475e82b1143c383e13b0b6fc27de78fb81adc73cc2febf5dbb28e45a770c850275642aa338ceddac6ef83fd41f0b739e615855d05a39dc0f901b6
 DIST 5.8.0-beta.tar.gz 183120 BLAKE2B 82d6a2e40aab046b14c6256acca458765bc744144f57d8aeae5201f8e89d97c70d5dbc42fe89880ded8ea9ee9ff96e2f2a91f3da8e7b13fb52cd4ba75caedaf6 SHA512 07d9cb217922239ad79ec6632d28f87d986e69ec3fd5c5440dbae96514a10a66f043efa84031c6541c3b1dc8b6786b5265c9cdd98f8b4102c3e937934bad649a
--- a/app-misc/apidb/apidb-5.13.1_beta.ebuild
+++ b/app-misc/apidb/apidb-5.13.1_beta.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_BINARY=cmake
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake
+
+MYPV="${PV/_beta/-beta}"
+MYPN="${PN}"
+MYP="${MYPN}-${MYPV}"
+
+DESCRIPTION="API Generator for Database access"
+HOMEPAGE="https://github.com/azaeldevel/apidb"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/azaeldevel/apidb.git"
+else
+	inherit autotools
+	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="+mariadb postgresql commands gtk +corelibs"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/boost
+	dev-libs/octetos-coreutils
+	dev-libs/octetos-db-abstract
+	gtk? ( x11-libs/gtk+:3 )
+	dev-libs/libtar
+	mariadb? ( dev-libs/octetos-db-maria )
+	postgresql? ( dev-libs/octetos-db-postgresql )
+	gnome-base/librsvg
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
+	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	APIDBBUILD="CORE"
+	APIDBINSTALL=""
+	if use corelibs ;then
+		APIDBINSTALL="CORE"
+	fi
+	if use mariadb ;then
+		APIDBBUILD="$APIDBBUILD;MARIADB"
+		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
+	fi
+	if use postgresql ;then
+		APIDBBUILD="$APIDBBUILD;POSTGRESQL"
+		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
+	fi
+	if use commands ;then
+		APIDBINSTALL="$APIDBINSTALL;COMMANDS"
+	fi
+	if use gtk ;then
+		APIDBINSTALL="$APIDBINSTALL;GTK3"
+	fi
+	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
+	cmake_src_configure
+}
--- a/app-misc/navi/Manifest
+++ b/app-misc/navi/Manifest
@@ -80,9 +80,9 @@ DIST remove_dir_all-0.7.0.crate 9041 BLAKE2B ec298c4c6ac01bff3af5618ffa59aca535d
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
-DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
+DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
-DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
+DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
 DIST shellwords-1.1.0.crate 3965 BLAKE2B ed45861b5b0760e078fad4eb19d0f0891bdcc559ac56187c512313c94c938e36cdfcf9c9d856ee0234413d775e735796a979aa7f312d2ccfd08862a6e6474d02 SHA512 1af48cfd1c09fa21aa436acfadf664a82b0fbccfae0c0ff8f01602ab912e0a4a0adf8677159af8ade9bc99a1df28774fda76ade243d8ac70afe0da8fe3c4098c
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
--- a/app-misc/navi/navi-9999.ebuild
+++ b/app-misc/navi/navi-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# Auto-Generated by cargo-ebuild 0.3.1
+# Auto-Generated by cargo-ebuild 0.3.2

 EAPI=7

@@ -64,8 +64,8 @@ CRATES="
 	remove_dir_all-0.7.0
 	same-file-1.0.6
 	scopeguard-1.1.0
-	serde-1.0.126
-	serde_derive-1.0.126
+	serde-1.0.127
+	serde_derive-1.0.127
 	serde_yaml-0.8.17
 	shellwords-1.1.0
 	signal-hook-0.3.9
--- a/app-text/mdbook/Manifest
+++ b/app-text/mdbook/Manifest
@@ -92,6 +92,7 @@ DIST markup5ever_rcdom-0.1.0.crate 25165 BLAKE2B 4123ee804991e9be31e6a4dbcb7dcce
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST mdbook-0.4.10.tar.gz 1483113 BLAKE2B 0295b4dd5e0ebc1f7347d9345e1cb001c7a12925855fa0a708e2fb40e285bacd7118014ebfd72905f450aa950d2b3e98573b94b53a03057d349d9b171e81ba47 SHA512 309b51b4765e8c5ff354d3da1e77f552662f97ca312e60ceba4aa10da3b2d51d0ee750811e65a5044dacb2fd3720c9f65ff6968fd242e16c16644247f40e2ee5
 DIST mdbook-0.4.11.tar.gz 1490029 BLAKE2B 0bf0207ea6ebc7516634e429f599111dd437111bc0a227e04cc4243ad413cbe1af7c64eac6466b634088f0b751d8c43e99f4dbb7217e853663c9a5692f9b30fe SHA512 cb145e8645594ac8bab59f4abe2d3fecd9437908e7c1ef9354ba82a8f20199ed55d962944038e6d4ec8003f4374e7ead5148aeaf3b42aab1dfe60e8e57956fc8
+DIST mdbook-0.4.12.tar.gz 1485183 BLAKE2B 8952b440014c6418696f9cce752f369e69b4d9401cf0de832496a3dcb8a13d2e5a2189a45e0764734dc7e0853fb98073c9251830b75d60924e4a122de9e1fd90 SHA512 e2e76fe303ca3abd76ac97aac7692178ae51744b2adb567d2cf3cb5009bfd807922e0e054b296746e57fabdae98835ebbfd838f6191fbfced138f9d73dc99de0
 DIST mdbook-0.4.9.tar.gz 1482002 BLAKE2B 0597c8771fe3e27aab68ac60aec561ec1782347c409d11ced27b315b33c4a87526af36934f9be8dfb32667c745f95e3323a080b0770089171241c1f38b488bcf SHA512 b8df26893054f05b28e81353fe71bc3e0355db70a2b7f894a9c8a4c5b2f608e8eae5e0b3de285e1ddf2c34d53a8902fd4513a72f0f2b1c35d1f0a054ed231782
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
--- a/app-text/mdbook/mdbook-0.4.12.ebuild
+++ b/app-text/mdbook/mdbook-0.4.12.ebuild
@@ -0,0 +1,240 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.2
+
+EAPI=7
+
+CRATES="
+	aho-corasick-0.7.18
+	ammonia-3.1.1
+	ansi_term-0.11.0
+	anyhow-1.0.40
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.2.1
+	block-buffer-0.7.3
+	block-buffer-0.9.0
+	block-padding-0.1.5
+	byte-tools-0.3.1
+	byteorder-1.4.3
+	bytes-1.0.1
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	cpufeatures-0.1.1
+	ctor-0.1.20
+	difference-2.0.0
+	digest-0.8.1
+	digest-0.9.0
+	either-1.6.1
+	elasticlunr-rs-2.3.11
+	env_logger-0.7.1
+	fake-simd-0.1.2
+	filetime-0.2.14
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	fsevent-0.4.0
+	fsevent-sys-2.0.1
+	fuchsia-zircon-0.3.3
+	fuchsia-zircon-sys-0.3.3
+	futf-0.1.4
+	futures-0.3.14
+	futures-channel-0.3.14
+	futures-core-0.3.14
+	futures-io-0.3.14
+	futures-macro-0.3.14
+	futures-sink-0.3.14
+	futures-task-0.3.14
+	futures-util-0.3.14
+	generic-array-0.12.4
+	generic-array-0.14.4
+	getopts-0.2.21
+	getrandom-0.1.16
+	getrandom-0.2.2
+	gitignore-1.0.7
+	glob-0.3.0
+	h2-0.3.3
+	handlebars-4.0.0
+	hashbrown-0.9.1
+	headers-0.3.4
+	headers-core-0.2.0
+	heck-0.3.2
+	hermit-abi-0.1.18
+	html5ever-0.25.1
+	http-0.2.4
+	http-body-0.4.2
+	httparse-1.4.0
+	httpdate-1.0.1
+	humantime-1.3.0
+	hyper-0.14.11
+	idna-0.2.3
+	indexmap-1.6.2
+	inotify-0.7.1
+	inotify-sys-0.1.5
+	input_buffer-0.4.0
+	iovec-0.1.4
+	itoa-0.4.7
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.94
+	log-0.4.14
+	mac-0.1.1
+	maplit-1.0.2
+	markup5ever-0.10.1
+	markup5ever_rcdom-0.1.0
+	matches-0.1.8
+	memchr-2.4.0
+	mime-0.3.16
+	mime_guess-2.0.3
+	mio-0.6.23
+	mio-0.7.13
+	mio-extras-2.0.6
+	miow-0.2.2
+	miow-0.3.7
+	net2-0.2.37
+	new_debug_unreachable-1.0.4
+	notify-4.0.16
+	ntapi-0.3.6
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	opaque-debug-0.2.3
+	opaque-debug-0.3.0
+	open-1.7.0
+	output_vt100-0.1.2
+	percent-encoding-2.1.0
+	pest-2.1.3
+	pest_derive-2.1.0
+	pest_generator-2.1.3
+	pest_meta-2.1.3
+	phf-0.8.0
+	phf_codegen-0.8.0
+	phf_generator-0.8.0
+	phf_shared-0.8.0
+	pin-project-1.0.7
+	pin-project-internal-1.0.7
+	pin-project-lite-0.2.6
+	pin-utils-0.1.0
+	ppv-lite86-0.2.10
+	precomputed-hash-0.1.1
+	pretty_assertions-0.6.1
+	proc-macro-hack-0.5.19
+	proc-macro-nested-0.1.7
+	proc-macro2-1.0.26
+	pulldown-cmark-0.7.2
+	quick-error-1.2.3
+	quick-error-2.0.1
+	quote-1.0.9
+	rand-0.7.3
+	rand-0.8.3
+	rand_chacha-0.2.2
+	rand_chacha-0.3.0
+	rand_core-0.5.1
+	rand_core-0.6.2
+	rand_hc-0.2.0
+	rand_hc-0.3.0
+	rand_pcg-0.2.1
+	redox_syscall-0.2.8
+	regex-1.5.4
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	ryu-1.0.5
+	same-file-1.0.6
+	scoped-tls-1.0.0
+	select-0.5.0
+	semver-0.11.0
+	semver-parser-0.10.2
+	serde-1.0.125
+	serde_derive-1.0.125
+	serde_json-1.0.64
+	serde_urlencoded-0.7.0
+	sha-1-0.8.2
+	sha-1-0.9.5
+	shlex-1.0.0
+	siphasher-0.3.5
+	slab-0.4.3
+	socket2-0.4.0
+	string_cache-0.8.1
+	string_cache_codegen-0.5.1
+	strsim-0.8.0
+	strum-0.18.0
+	strum_macros-0.18.0
+	syn-1.0.72
+	tempfile-3.2.0
+	tendril-0.4.2
+	termcolor-1.1.2
+	textwrap-0.11.0
+	time-0.1.43
+	tinyvec-1.2.0
+	tinyvec_macros-0.1.0
+	tokio-1.9.0
+	tokio-macros-1.3.0
+	tokio-stream-0.1.7
+	tokio-tungstenite-0.13.0
+	tokio-util-0.6.7
+	toml-0.5.8
+	tower-service-0.3.1
+	tracing-0.1.26
+	tracing-core-0.1.18
+	try-lock-0.2.3
+	tungstenite-0.12.0
+	typenum-1.13.0
+	ucd-trie-0.1.3
+	unicase-2.6.0
+	unicode-bidi-0.3.5
+	unicode-normalization-0.1.17
+	unicode-segmentation-1.7.1
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	url-2.2.2
+	utf-8-0.7.6
+	vec_map-0.8.2
+	version_check-0.9.3
+	walkdir-2.3.2
+	want-0.3.0
+	warp-0.3.1
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
+	which-4.1.0
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	ws2_32-sys-0.2.1
+	xml5ever-0.16.1
+"
+
+inherit cargo
+
+DESCRIPTION="Creates a book from markdown files"
+HOMEPAGE="https://github.com/rust-lang/mdBook"
+SRC_URI="https://github.com/rust-lang/mdBook/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD CC0-1.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+RESTRICT="mirror"
+
+QA_FLAGS_IGNORED="usr/bin/mdbook"
+
+src_prepare() {
+	eapply_user
+
+	mv ../mdBook-${PV}/{.,}* .
+}
+
+src_install() {
+	cargo_src_install
+
+	dodoc CHANGELOG.md README.md
+}
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1 +1,2 @@
 DIST 0.9.8-assembly 63242123 BLAKE2B 851bc6dafe6a9564d7a760736cdc9f9641dc58582ddd215651249a8d1f7664e3f8f034ae6d03fcc801477d85ea87350ce25de1157c521de938ba47214e84568d SHA512 1afb93740df0945df9b7119a3cac1845591b677137fc1f1e215354d19d142c4a92293552590402d78b7337818059fedb21ba5be4d8309df6633c253b5b6378af
+DIST 0.9.9-assembly 63255731 BLAKE2B ae4112a087b5aa6205a87fbef690820b4fde0d72962bb65d479bcdb666cf839df180935674947d53e81711377f0a8bd81bda5cdd8341027c9a2bd3bbc1869a3f SHA512 b7589c36a0607602150378c94c5cb6aba56a70ebe73517c081fbd603ad948bbff5302c17d0cecaac32741452598643089350348474988c0ff973e4bf620a7b3c
--- a/dev-java/mill-bin/mill-bin-0.9.9.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.9.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://com-lihaoyi.github.io/mill/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+src_install() {
+	newbin "${DISTDIR}/${PV}-assembly" ${MY_PN}
+}
--- a/dev-python/pydub/pydub-0.25.1.ebuild
+++ b/dev-python/pydub/pydub-0.25.1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"

 BDEPEND="
 	test? (
-		media-video/ffmpeg
+		media-video/ffmpeg[mp3,vorbis]
 	)
 	"

--- a/dev-scheme/gerbil/files/99gerbil
+++ b/dev-scheme/gerbil/files/99gerbil
@@ -0,0 +1 @@
+GERBIL_HOME=/usr/share/gerbil
--- a/dev-scheme/gerbil/files/gerbil_home.sh
+++ b/dev-scheme/gerbil/files/gerbil_home.sh
@@ -1,6 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-
-GERBIL_HOME="${EPREFIX}/usr/share/gerbil"
-export GERBIL_HOME
--- a/dev-scheme/gerbil/gerbil-0.16.ebuild
+++ b/dev-scheme/gerbil/gerbil-0.16.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

-inherit elisp-common toolchain-funcs wrapper
+inherit elisp-common toolchain-funcs wrapper xdg-utils

 DESCRIPTION="Dialect of Scheme designed for Systems Programming"
-HOMEPAGE="
-	https://cons.io/
-	https://github.com/vyzo/gerbil
-"
+HOMEPAGE="https://cons.io/ https://github.com/vyzo/gerbil"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
@@ -23,7 +20,8 @@ LICENSE="Apache-2.0 LGPL-2.1"
 SLOT="0"
 IUSE="emacs leveldb lmdb mysql +sqlite +xml yaml +zlib"

-DEPEND="
+BDEPEND="dev-scheme/gambit"
+RDEPEND="
 	dev-scheme/gambit
 	emacs? ( >=app-editors/emacs-23.1:* )
 	leveldb? ( dev-libs/leveldb )
@@ -34,17 +32,29 @@ DEPEND="
 	yaml? ( dev-libs/libyaml )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"

 S="${WORKDIR}/${P}/src"

 SITEFILE="70${PN}-gentoo.el"

-src_configure() {
+src_prepare() {
 	# Just to be safe, because './configure --help' says:
 	# "Set default GERBIL_HOME (environment variable still overrides)"
 	unset GERBIL_HOME
+	xdg_environment_reset

+	# Verbose build process
+	GAMBCOMP_VERBOSE="yes"
+	export GAMBCOMP_VERBOSE
+
+	default
+
+	sed -i "s|gcc|$(tc-getCC)|g" ./build.sh || die "Failed to fix CC setting"
+	sed -i "s|-O2|${CFLAGS}|g" ./build.sh || die "Failed to fix CFLAGS setting"
+}
+
+src_configure() {
 	local myconf=(
 		$(use_enable leveldb)
 		$(use_enable lmdb)
@@ -56,41 +66,35 @@ src_configure() {
 		--prefix="${D}/usr/share/${PN}"
 	)
 	# This is not a standard 'configure' script!
-	gsi ./configure "${myconf[@]}" \
-		|| die "Failed to configure using the 'configure' script"
+	gsi ./configure "${myconf[@]}" ||
+		die "Failed to configure using the 'configure' script"
 }

 src_compile() {
-	# Verbose build process
-	GAMBCOMP_VERBOSE="yes"
-	export GAMBCOMP_VERBOSE
-
 	# The 'build.sh' script uses environment variables that are exported
 	# by portage, ie.: CFLAGS, LDFLAGS, ...
-	sh ./build.sh \
-		|| die "Failed to compile using the 'build.sh' script"
+	sh ./build.sh ||
+		die "Failed to compile using the 'build.sh' script"
 }

 src_install() {
-	mkdir -p "${D}/usr/share/${PN}" \
-		|| die "Failed to make ${D}/usr/share/${PN} directory"
-	gsi ./install \
-		|| die "Failed to install using the 'install' script"
+	mkdir -p "${D}/usr/share/${PN}" ||
+		die "Failed to make ${D}/usr/share/${PN} directory"
+	gsi ./install || die "Failed to install using the 'install' script"

-	sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" \
-		|| die "Failed to fix the 'gxc' executable script"
+	sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" ||
+		die "Failed to fix the 'gxc' executable script"

-	mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" \
-		|| die "Failed to fix '/usr/share/emacs' install path"
-	mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" \
-		|| die "Failed to fix '/usr/share/gerbil/TAGS' install path"
+	mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" ||
+		die "Failed to fix '/usr/share/emacs' install path"
+	mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" ||
+		die "Failed to fix '/usr/share/gerbil/TAGS' install path"

 	# Compile the 'gerbil-mode.el'
 	if use emacs; then
-		pushd "${D}/usr/share/emacs/site-lisp/gerbil" || die
-		elisp-compile *.el || die "Failed to compile elisp files"
+		elisp-compile "${D}/usr/share/emacs/site-lisp/gerbil"/*.el ||
+			die "Failed to compile elisp files"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		popd || die
 	fi

 	# Create wrappers for gerbil executables in GERBIL_HOME (/usr/share/gerbil)
@@ -102,9 +106,7 @@ src_install() {
 	popd || die

 	# Without this the programs compiled with gxc will break!
-	# FIXME: Patch gerbil to compile with te correct 'GERBIL_HOME'?
-	insinto "/etc/profile.d"
-	doins "${FILESDIR}/gerbil_home.sh"
+	doenvd "${FILESDIR}/99${PN}"
 }

 pkg_postinst() {
--- a/dev-scheme/gerbil/gerbil-9999.ebuild
+++ b/dev-scheme/gerbil/gerbil-9999.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

-inherit elisp-common toolchain-funcs wrapper
+inherit elisp-common toolchain-funcs wrapper xdg-utils

 DESCRIPTION="Dialect of Scheme designed for Systems Programming"
-HOMEPAGE="
-	https://cons.io/
-	https://github.com/vyzo/gerbil
-"
+HOMEPAGE="https://cons.io/ https://github.com/vyzo/gerbil"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
@@ -23,7 +20,8 @@ LICENSE="Apache-2.0 LGPL-2.1"
 SLOT="0"
 IUSE="emacs leveldb lmdb mysql +sqlite +xml yaml +zlib"

-DEPEND="
+BDEPEND="dev-scheme/gambit"
+RDEPEND="
 	dev-scheme/gambit
 	emacs? ( >=app-editors/emacs-23.1:* )
 	leveldb? ( dev-libs/leveldb )
@@ -34,13 +32,22 @@ DEPEND="
 	yaml? ( dev-libs/libyaml )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"

 S="${WORKDIR}/${P}/src"

 SITEFILE="70${PN}-gentoo.el"

 src_prepare() {
+	# Just to be safe, because './configure --help' says:
+	# "Set default GERBIL_HOME (environment variable still overrides)"
+	unset GERBIL_HOME
+	xdg_environment_reset
+
+	# Verbose build process
+	GAMBCOMP_VERBOSE="yes"
+	export GAMBCOMP_VERBOSE
+
 	default

 	sed -i "s|gcc|$(tc-getCC)|g" ./build.sh || die "Failed to fix CC setting"
@@ -48,10 +55,6 @@ src_prepare() {
 }

 src_configure() {
-	# Just to be safe, because './configure --help' says:
-	# "Set default GERBIL_HOME (environment variable still overrides)"
-	unset GERBIL_HOME
-
 	local myconf=(
 		$(use_enable leveldb)
 		$(use_enable lmdb)
@@ -63,41 +66,35 @@ src_configure() {
 		--prefix="${D}/usr/share/${PN}"
 	)
 	# This is not a standard 'configure' script!
-	gsi ./configure "${myconf[@]}" \
-		|| die "Failed to configure using the 'configure' script"
+	gsi ./configure "${myconf[@]}" ||
+		die "Failed to configure using the 'configure' script"
 }

 src_compile() {
-	# Verbose build process
-	GAMBCOMP_VERBOSE="yes"
-	export GAMBCOMP_VERBOSE
-
 	# The 'build.sh' script uses environment variables that are exported
 	# by portage, ie.: CFLAGS, LDFLAGS, ...
-	sh ./build.sh \
-		|| die "Failed to compile using the 'build.sh' script"
+	sh ./build.sh ||
+		die "Failed to compile using the 'build.sh' script"
 }

 src_install() {
-	mkdir -p "${D}/usr/share/${PN}" \
-		|| die "Failed to make ${D}/usr/share/${PN} directory"
-	gsi ./install \
-		|| die "Failed to install using the 'install' script"
+	mkdir -p "${D}/usr/share/${PN}" ||
+		die "Failed to make ${D}/usr/share/${PN} directory"
+	gsi ./install || die "Failed to install using the 'install' script"

-	sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" \
-		|| die "Failed to fix the 'gxc' executable script"
+	sed -i "s|${D}|${EPREFIX}|g" "${D}/usr/share/${PN}/bin/gxc" ||
+		die "Failed to fix the 'gxc' executable script"

-	mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" \
-		|| die "Failed to fix '/usr/share/emacs' install path"
-	mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" \
-		|| die "Failed to fix '/usr/share/gerbil/TAGS' install path"
+	mv "${D}/usr/share/${PN}/share/emacs" "${D}/usr/share/emacs" ||
+		die "Failed to fix '/usr/share/emacs' install path"
+	mv "${D}/usr/share/${PN}/share/${PN}/TAGS" "${D}/usr/share/${PN}/TAGS" ||
+		die "Failed to fix '/usr/share/gerbil/TAGS' install path"

 	# Compile the 'gerbil-mode.el'
 	if use emacs; then
-		pushd "${D}/usr/share/emacs/site-lisp/gerbil" || die
-		elisp-compile *.el || die "Failed to compile elisp files"
+		elisp-compile "${D}/usr/share/emacs/site-lisp/gerbil"/*.el ||
+			die "Failed to compile elisp files"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		popd || die
 	fi

 	# Create wrappers for gerbil executables in GERBIL_HOME (/usr/share/gerbil)
@@ -109,9 +106,7 @@ src_install() {
 	popd || die

 	# Without this the programs compiled with gxc will break!
-	# FIXME: Patch gerbil to compile with te correct 'GERBIL_HOME'?
-	insinto "/etc/profile.d"
-	doins "${FILESDIR}/gerbil_home.sh"
+	doenvd "${FILESDIR}/99${PN}"
 }

 pkg_postinst() {
--- a/dev-scheme/gerbil/metadata.xml
+++ b/dev-scheme/gerbil/metadata.xml
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xgqt@riseup.net</email>
-		<name>Maciej Barć</name>
-	</maintainer>
-	<use>
-		<flag name="leveldb">
-			Add support for using dev-libs/leveldb
-		</flag>
-		<flag name="lmdb">
-			Add support for using dev-db/lmdb
-		</flag>
-		<flag name="yaml">
-			Add support for yaml file format
-		</flag>
-	</use>
-	<longdescription lang="en">
-		Gerbil is an opinionated dialect of Scheme designed
-		for Systems Programming, with a state of the art macro
-		and module system on top of the Gambit runtime.
-		The macro system is based on quote-syntax, and provides
-		the full meta-syntactic tower with a native implementation
-		of syntax-case. It also provides a full-blown module system,
-		similar to PLT Scheme’s (Racket) modules. The main difference
-		from Racket is that Gerbil modules are single instantiation,
-		supporting high performance ahead of time compilation
-		and compiled macros.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vyzo/gerbil</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@riseup.net</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <use>
+    <flag name="leveldb">
+      Add support for using dev-libs/leveldb
+    </flag>
+    <flag name="lmdb">
+      Add support for using dev-db/lmdb
+    </flag>
+    <flag name="yaml">
+      Add support for yaml file format
+    </flag>
+  </use>
+  <longdescription lang="en">
+    Gerbil is an opinionated dialect of Scheme designed
+    for Systems Programming, with a state of the art macro
+    and module system on top of the Gambit runtime.
+    The macro system is based on quote-syntax, and provides
+    the full meta-syntactic tower with a native implementation
+    of syntax-case. It also provides a full-blown module system,
+    similar to PLT Scheme’s (Racket) modules. The main difference
+    from Racket is that Gerbil modules are single instantiation,
+    supporting high performance ahead of time compilation
+    and compiled macros.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">vyzo/gerbil</remote-id>
+    <bugs-to>https://github.com/vyzo/gerbil</bugs-to>
+  </upstream>
 </pkgmetadata>
--- a/dev-util/mh/metadata.xml
+++ b/dev-util/mh/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
+	<maintainer type="person">
 		<name>Oz Tiram</name>
 		<email>oz.tiram@gmail.com</email>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		A small program you put in your Makefile to produce fancy help.
 		mh parses the comments you put after targets and variables, and
--- a/dev-util/rust-analyzer-bin/Manifest
+++ b/dev-util/rust-analyzer-bin/Manifest
@@ -1 +1 @@
-DIST rust-analyzer-x86_64-unknown-linux-gnu.gz 11589435 BLAKE2B 571ed4fdf5bc9f35d64b52b4b8cde7b0e0b534e0e8361e34ef51bd885d040c29c359a07de10ec338371144efc8d74f27314cfd08eb184e7fb20ded48a1d750a6 SHA512 6c15c4ff859f88917a486aa04bba1db0e28e85356814fe10e783f27946589bdb68cbb99057c889fd8011994a8e2fbafb6e0fd640c2d744144e07f07188d6761b
+DIST rust-analyzer-bin-2021.08.02.gz 11550409 BLAKE2B 6d1dc7dd15375016f153d53c408f882f219778dfbeaa98e15fcb51a5f6704b29a73205c1c2ed1162ad2794387d9abc3fc569a19d243135428fc4ab6b46b9bcac SHA512 c23b2e9d645863b84e0961429c654365887f265faf883f94b62bedc4a9b8de25c00cc3e1653d614f485bebb9cbe4abb241072955d8d46bdc082795d597285422
--- a/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.08.02.ebuild
+++ b/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.08.02.ebuild
@@ -5,7 +5,7 @@ EAPI=7

 DESCRIPTION="An implementation of Language Server Protocol for the Rust programming language"
 HOMEPAGE="https://rust-analyzer.github.io"
-SRC_URI="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-07-26/rust-analyzer-x86_64-unknown-linux-gnu.gz"
+SRC_URI="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-08-02/rust-analyzer-x86_64-unknown-linux-gnu.gz -> ${P}.gz"

 LICENSE="Apache-2.0 MIT-with-advertising"
 SLOT="0"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 S=${WORKDIR}

 src_install() {
-	newbin rust-analyzer-x86_64-unknown-linux-gnu rust-analyzer
+	newbin ${P} rust-analyzer
 }

 pkg_postinst() {
--- a/dev-vcs/got/Manifest
+++ b/dev-vcs/got/Manifest
@@ -0,0 +1 @@
+DIST got-0_p20210217.tar.gz 517647 BLAKE2B 4b4f5436c5804aa60038d737de883eb69ce4d4f0f705f7d310722222da38b917d577a09fb37b2317c1a34b1a0aa2b0fe00cf07dcbb350a901fe50dbb31ca6ede SHA512 fb3c60b5d1036d735e775e362c7349720bfeae62c1e8b830417b5edd57c86546a97113f6b10b742b1b3b6146d0a7e41906042c1008551b4d15e2bd0331c7ab2f
--- a/dev-vcs/got/got-0_p20210217.ebuild
+++ b/dev-vcs/got/got-0_p20210217.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PN="${PN}-portable"
+COMMIT="36536ee0b0fb5108076d8238a4b78c59db9dac3d"  # "linux" branch
+DESCRIPTION="Portable version of the Game of Trees version control system"
+HOMEPAGE="https://gameoftrees.org"
+SRC_URI="https://git.gameoftrees.org/gitweb/?p=${MY_PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT:0:7}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-crypt/libmd
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	sys-libs/zlib:=
+	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
+	!elibc_Darwin? (
+		dev-libs/libbsd
+		!elibc_SunOS? (
+			sys-apps/util-linux
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+DOCS=( CHANGES README README.portable )
+
+src_prepare() {
+	default
+
+	# remove debugging flags (-Werror, -g, ...)
+	sed "s/\(GOT_RELEASE\)=No/\1=Yes/" -i configure.ac || die
+	sed "/AM_CFLAGS += -g/d" -i Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	doman got/*.5
+}
--- a/dev-vcs/got/metadata.xml
+++ b/dev-vcs/got/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<longdescription>
+		Game of Trees (Got) is a version control system which prioritizes
+		ease of use and simplicity over flexibility.
+
+		Got uses Git repositories to store versioned data. Git can be used
+		for any functionality which has not yet been implemented in Got.
+		It will always remain possible to work with both Got and Git on the
+		same repository.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>thomas@xteddy.org</email>
+			<name>Thomas Adam</name>
+		</maintainer>
+		<bugs-to>mailto:gameoftrees@openbsd.org</bugs-to>
+		<doc>https://gameoftrees.org/examples.html</doc>
+		<changelog>https://git.gameoftrees.org/gitweb/?p=got-portable.git;a=blob_plain;f=CHANGES</changelog>
+	</upstream>
+</pkgmetadata>
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake git-r3 xdg
+
+DESCRIPTION="A Nintendo 3DS Emulator"
+HOMEPAGE="https://citra-emu.org"
+EGIT_REPO_URI="https://github.com/citra-emu/citra"
+EGIT_SUBMODULES=( "*" "-boost" "-catch" "-cryptopp" "-enet" "-inih" "-libressl" "-externals/dynarmic/externals/xbyak" "-zstd" )
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
+
+DEPEND="
+	!hle-sound? ( media-libs/fdk-aac )
+	hle-sound? ( media-video/ffmpeg[fdk] )
+	qt5? ( nls? ( dev-qt/linguist )
+			dev-qt/qtgui
+			dev-qt/qtmultimedia
+			dev-qt/qtnetwork
+			dev-qt/qtopengl
+			dev-qt/qtwidgets )
+	sdl? (
+		media-libs/libsdl2
+		>=dev-libs/inih-52
+	)
+	system-libfmt? ( <=dev-libs/libfmt-8 )
+	video? ( media-video/ffmpeg )
+	>=app-arch/zstd-1.4.8
+	>=dev-libs/openssl-1.1
+	dev-cpp/catch:0
+	dev-libs/boost:=
+	dev-libs/crypto++
+	net-libs/enet:1.3
+"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="|| ( qt5 sdl )"
+
+src_unpack() {
+	if use system-libfmt; then
+		EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
+	fi
+	git-r3_src_unpack
+
+	cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
+
+	# Do not fetch via sources because this file always changes
+	curl https://api.citra-emu.org/gamedb/ > "${S}"/compatibility_list.json
+}
+
+src_prepare() {
+	# Do not care about submodules wanted one are already fetched
+	sed -i -e '/check_submodules_present()/d' CMakeLists.txt || die
+
+	# Unbundle inih
+	sed -i -e '/inih/d' externals/CMakeLists.txt || die
+	sed -i -e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \
+		-e '/target_link_libraries/s/inih/${INIH_LIBRARIES}/' src/citra/CMakeLists.txt || die
+	sed -i -e 's:inih/cpp/::' src/citra/config.cpp || die
+
+	# Fix boost unbundling
+	sed -i -e '/(-DBOOST_ERROR_CODE_HEADER_ONLY/,/)/d' CMakeLists.txt || die
+	sed -i -e '/[Bb][Oo][Oo][Ss][Tt]/d' externals/CMakeLists.txt || die
+
+	# Unbundle libressl (TODO rework scopes, find_package(OpenSSL is called 5 times)
+	sed -i -e '$afind_package(OpenSSL 1.1)\nset(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto PARENT_SCOPE)' \
+		CMakeLists.txt || die
+	sed -i -e 's/# LibreSSL/find_package(OpenSSL 1.1)\nif (NOT OPENSSL_FOUND)\n/' \
+		-e 's/-DHAVE_INET_NTOP)$/&\nendif()\n/' externals/CMakeLists.txt || die
+	sed -i -e '/get_directory_property(OPENSSL_LIBS/,/)/d' \
+		-e 's/OPENSSL_LIBS/OPENSSL_LIBRARIES/' \
+		src/web_service/CMakeLists.txt \
+		src/core/CMakeLists.txt || die
+	sed -i -e 's/{PLATFORM_LIBRARIES}/& OpenSSL::SSL OpenSSL::Crypto/' \
+		src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
+	sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
+
+	if use system-libfmt; then # Unbundle libfmt
+		sed -i -e '/fmt/d' externals/CMakeLists.txt || die
+		sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
+			src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt
+		sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
+	fi
+
+	# Unbundle zstd
+	sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
+		-e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ZSTD REQUIRED libzstd)' \
+		src/common/CMakeLists.txt || die
+	sed -i -e '/zstd/d' externals/CMakeLists.txt || die
+
+	# Unbundle enet
+	sed -i -e 's:enet:${ENET_LIBRARIES}:' \
+		-e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(ENET REQUIRED libenet)' \
+		src/network/CMakeLists.txt || die
+	sed -i -e '/#include.*enet/{s/"/</;s/"/>/}' src/network/*cpp || die
+	sed -i -e '/enet/d' externals/CMakeLists.txt || die
+
+	# Unbundle crypto++
+	sed -i -e 's:cryptopp:${CRYPTOPP_LIBRARIES}:' \
+		-e '1ifind_package(PkgConfig REQUIRED)\npkg_check_modules(CRYPTOPP REQUIRED libcryptopp)' \
+		src/dedicated_room/CMakeLists.txt \
+		src/core/CMakeLists.txt || die
+	sed -i -e '/cryptopp/d' externals/CMakeLists.txt || die
+
+	# TODO unbundle catch
+	sed -i -e '1ifind_package(Catch2)' src/tests/CMakeLists.txt externals/{dynarmic,teakra}/tests/CMakeLists.txt || die
+	sed -i -e '/target_link_libraries/s/catch/Catch2::Catch2/' externals/{dynarmic,teakra}/tests/CMakeLists.txt || die
+	sed -i -e '/target_link_libraries/s/catch-single-include/Catch2::Catch2/' src/tests/CMakeLists.txt || die
+	sed -i -e '/catch/d' externals/CMakeLists.txt externals/{dynarmic,teakra}/externals/CMakeLists.txt || die
+	grep -rl 'include <catch.hpp>' externals/{dynarmic,teakra} | xargs sed -i -e '/include/s:catch.hpp:catch/&:' || die
+
+	# TODO unbundle xbyak (wait for 5.96 in ytree)
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DENABLE_CUBEB=$(usex cubeb)
+		-DENABLE_FFMPEG_AUDIO_DECODER=$(usex hle-sound)
+		-DENABLE_FFMPEG_VIDEO_DUMPER=$(usex hle-sound)
+		-DENABLE_QT=$(usex qt5)
+		-DENABLE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
+		-DENABLE_SDL2=$(usex sdl)
+		-DENABLE_WEB_SERVICE=$(usex telemetry)
+		-DGENERATE_QT_TRANSLATION=$(use qt5 && usex nls || echo OFF)
+		-DUSE_SYSTEM_BOOST=ON
+	)
+	cmake_src_configure
+
+	# This would be better in src_unpack but it would be unlinked
+	mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die
+}
--- a/games-emulation/citra/metadata.xml
+++ b/games-emulation/citra/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<name>Samuel Bauer</name>
+	<email>samuel.bauer@yahoo.fr</email>
+</maintainer>
+<use>
+	<flag name="cubeb">Enables the cubeb audio backend</flag>
+	<flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag>
+	<flag name="system-libfmt">Use system libfmt</flag>
+	<flag name="telemetry">Enable web services (telemetry, etc.)</flag>
+	<flag name="video">Enable FFmpeg video dumper</flag>
+</use>
+</pkgmetadata>
--- a/games-emulation/yuzu/metadata.xml
+++ b/games-emulation/yuzu/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name="cubeb">Enables the cubeb audio backend</flag>
 	<flag name="compatibility-list">Downloads the latest compatibility list</flag>
 	<flag name="discord">Enables Discord Rich Presence</flag>
+	<flag name="system-vulkan">Use system dev-util/vulkan-headers</flag>
 	<flag name="webengine">Use QtWebEngine for web applet implementation</flag>
 	<flag name="webservice">Enable web services (telemetry, etc.)</flag>
 </use>
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake git-r3 flag-o-matic toolchain-funcs xdg
 DESCRIPTION="An emulator for Nintendo Switch"
 HOMEPAGE="https://yuzu-emu.org"
 EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu"
-EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' '-Vulkan-Headers' )
+EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' )
 # TODO '-xbyak' wait for bump in tree
 # TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output
 #      media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ...
@@ -18,7 +18,7 @@ EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus'
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl webengine +webservice"
+IUSE="+boxcat +compatibility-list +cubeb discord +qt5 sdl system-vulkan webengine +webservice"

 DEPEND="
 	discord? ( >=dev-libs/rapidjson-1.1.0 )
@@ -30,6 +30,9 @@ DEPEND="
 		>=media-libs/libsdl2-2.0.14
 		>=dev-libs/inih-52
 	)
+	system-vulkan? (
+		>=dev-util/vulkan-headers-1.2.180
+	)
 	>=app-arch/lz4-1.8
 	>=app-arch/zstd-1.5
 	>=dev-cpp/catch-2.13:0
@@ -39,22 +42,27 @@ DEPEND="
 	>=dev-libs/libzip-1.5
 	>=media-libs/opus-1.3.1
 	>=sys-libs/zlib-1.2
-	dev-util/vulkan-headers
 	virtual/libusb:1
 "
-#	>=dev-libs/xbyak-5.96
 RDEPEND="${DEPEND}"
 REQUIRED_USE="boxcat? ( webservice ) || ( qt5 sdl )"

 PATCHES=( "${FILESDIR}"/${P}-assert.patch )

 pkg_setup() {
-	if [ tc-is-gcc -a $(gcc-major-version) -lt 10 ]; then
-		die "You need gcc version 10 or clang to compile this package"
+	if [ tc-is-gcc ]; then
+		[ "$(gcc-major-version)" -lt 11 ] && \
+			die "You need gcc version 11 or clang to compile this package"
 	fi
+	grep -q 'ThreadEngineStarter<void>' /usr/include/qt5/QtConcurrent/qtconcurrentthreadengine.h \
+		|| die "add user patch for dev-qt/qtconcurrent: https://github.com/qt/qtbase/commit/659f7a06e91c04b239e3f4c0bcfccbe3581af1c3.diff"
 }

 src_unpack() {
+	if use system-vulkan; then
+		EGIT_SUBMODULES+=('-Vulkan-Headers')
+	fi
+
 	git-r3_src_unpack

 	# Do not fetch via sources because this file always changes
@@ -88,9 +96,10 @@ src_prepare() {
 	# Unbundle xbyak ( uncomment when xbyak version is ok or never as it is only headers )
 	# sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt

-	# Unbundle vulkan headers
-	sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt || die
-	sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die
+	if use system-vulkan; then # Unbundle vulkan headers
+		sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt || die
+		sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp || die
+	fi

 	# Unbundle discord rapidjson
 	sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' externals/discord-rpc/CMakeLists.txt || die
@@ -120,10 +129,11 @@ src_configure() {
 		-DENABLE_SDL2=$(usex sdl)
 		-DENABLE_WEB_SERVICE=$(usex webservice)
 		-DUSE_DISCORD_PRESENCE=$(usex discord)
-		-DYUZU_ALLOW_SYSTEM_SDL2=$(usex sdl)
 		-DYUZU_ENABLE_BOXCAT=$(usex boxcat)
+		-DYUZU_USE_EXTERNAL_SDL2=OFF
 		-DYUZU_USE_QT_WEB_ENGINE=$(usex webengine)
 	)
+
 	cmake_src_configure

 	# This would be better in src_unpack but it would be unlinked
--- a/media-video/owncast/owncast-0.0.7-r1.ebuild
+++ b/media-video/owncast/owncast-0.0.7-r1.ebuild
--- a/net-misc/lagrange/Manifest
+++ b/net-misc/lagrange/Manifest
@@ -1,2 +1,2 @@
-DIST lagrange-1.6.0.tar.gz 22693081 BLAKE2B 447e2d45736b476ea060804ca9b4f382e8e396e4dab6a826756b44742403b35619440e51f59f27ea9e4456677383b069554f7eb034f8b23177dbb0c9a060dfba SHA512 db0e958b959b4dbcb1d34e4fb7c7683750aa8216dcfa7868aa32397b4740552f96d21f6409320ff2a4353fb695e7aa91efafe12ec5db3be00872cd387641efec
 DIST lagrange-1.6.1.tar.gz 22698567 BLAKE2B 186b92b92e9e3d97f06a47cae09be0bab3ef583fd60d13672f9ab1c712ba9dbccf609d0585d7966def03d485ac8cfba300cce0a41f9b550b4af89620e5fb7c01 SHA512 36f2d5829f190e195f6ce9611a669874de82b908746a8c71a3e51a51effc1b303a11e0cc838de56ca835e83c7dfd9163b6e1400758365b486961f3d0a977d231
+DIST lagrange-1.6.2.tar.gz 22708028 BLAKE2B 66e7ac6a32d6dba4c01f85fdff005cba1f02a5e8caa13971ae99d9da79db94e225cce1e235bbd3600e35d1333e02d46cf00a4dcf459f97fdefa062eb37ef1476 SHA512 2f4ad3c93535e8cd8f8106bc7428d0ae00f09ee1dc37334c57bd16d685145250fcc71c4d118206cb30055cd4095f3095f0a23b944769668e6ff3ac11bd36a42f
--- a/net-misc/lagrange/lagrange-1.6.2.ebuild
+++ b/net-misc/lagrange/lagrange-1.6.2.ebuild
@@ -35,6 +35,10 @@ src_configure() {
 		-DENABLE_HARFBUZZ=$(usex harfbuzz)
 		-DENABLE_MPG123=$(usex mp3)

+		# never build bundled libs
+		-DENABLE_FRIBIDI_BUILD=OFF
+		-DENABLE_HARFBUZZ_MINIMAL=OFF
+
 		# lib/the_Foundation
 		-DTFDN_ENABLE_WARN_ERROR=OFF
 		-DTFDN_ENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
@@ -44,9 +48,13 @@ src_configure() {
 }

 pkg_postinst() {
-	ewarn "Lagrange 1.6 introduces some breaking changes:"
-	ewarn
-	ewarn "- A new TOFU trust store will be created. The old one is kept around but ignored."
-	ewarn "- App state serialization format has been updated. Downgrading to a previous release"
-	ewarn "  will cause app state to be reset (e.g., tabs closed, navigation history cleared)."
+	xdg_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 1.6.0 ; then
+		ewarn "Lagrange 1.6 introduces some breaking changes:"
+		ewarn
+		ewarn "- A new TOFU trust store will be created. The old one is kept around but ignored."
+		ewarn "- App state serialization format has been updated. Downgrading to a previous release"
+		ewarn "  will cause app state to be reset (e.g., tabs closed, navigation history cleared)."
+	fi
 }
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -26,3 +26,8 @@ sys-kernel/xpmem modules
 # build failure
 # https://github.com/Portals4/portals4/issues/83
 sys-cluster/portals4 ppe
+
+# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2021-08-06)
+# sys-cluster/SOS doesn't get recognized as valid openshmem
+# https://github.com/bsc-performance-tools/extrae/issues/35
+sys-cluster/extrae openshmem
--- a/sys-apps/dust/Manifest
+++ b/sys-apps/dust/Manifest
@@ -32,6 +32,7 @@ DIST dust-0.5.3.tar.gz 85876 BLAKE2B b547939bba382fe09e3ce61bff9233e8d54a7539601
 DIST dust-0.5.4.tar.gz 86135 BLAKE2B 9de6668297e01fb5eec1c411f719296f49b4b9e94ba6bd8ce64df8d27bf84ba943f75c8ee17f99b40411ca8bcd12d2a53027a30844db65ddc5df0581920e013a SHA512 4ab89180d4757dd235a44988ea56fbe130e3b5cac596e8a1f7839c665c1eaa68819f37d4935a61db7d4f25befab3686c098e2a8e937822bede8a4167fb408142
 DIST dust-0.6.0.tar.gz 86205 BLAKE2B 623f0bc074ec1ba8e95a302385f0d5f4fb3679e88db0c4004d997e79eff723bebce3f00a4073ce1be058c9e2fb06a634056d0f00ed988ec0616b294de7845558 SHA512 6552b2dc34a077bda1db0e2773074238dac1154a3852f748a81513e28417374e8c06630176d70cc70e52cb44b5b9f9109417d83cf03751441434af0a9cf50377
 DIST dust-0.6.1.tar.gz 86682 BLAKE2B 639421a6935a79ff0c8656456e5aa13fb557c17f779d1d8d37dfd799ad785259f1df20221c7e42c215dbf6b5db273e55ceb015a514270679415dbc2fd6c781c6 SHA512 c83b0c938c0495c55e6548537f15cb0e377baa68fa1c761b4ac31ebc8c3636cf96a293a51b1492fc78daefcf03d7a3183c1fa741ec5118cab716dd746abc724b
+DIST dust-0.6.2.tar.gz 86689 BLAKE2B 5f744076f3704de20f0710845402eedf32a26be1b43e0c692de85804f2ebba5d44883d79109188bdd3160e2a9850122df7def914ef15ddfd8f2e150d732c7170 SHA512 49a1f20a1e8cfbbdc3aaa9896fe9fb49a641bcc32dbe569c98b5af386a9c95cfa42573accd6d3cf3290eeaac6341b62d52dc5e7b5e4acde7a090183495761af3
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
--- a/sys-apps/dust/dust-0.6.2.ebuild
+++ b/sys-apps/dust/dust-0.6.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.2
+
+EAPI=7
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	assert_cmd-1.0.7
+	atty-0.2.14
+	autocfg-1.0.1
+	bitflags-1.2.1
+	bstr-0.2.16
+	cfg-if-1.0.0
+	clap-2.33.3
+	crossbeam-channel-0.5.1
+	crossbeam-deque-0.8.0
+	crossbeam-epoch-0.9.5
+	crossbeam-utils-0.8.5
+	difflib-0.4.0
+	doc-comment-0.3.3
+	either-1.6.1
+	getrandom-0.2.3
+	hermit-abi-0.1.19
+	itertools-0.10.1
+	lazy_static-1.4.0
+	libc-0.2.98
+	lscolors-0.7.1
+	memchr-2.4.0
+	memoffset-0.6.4
+	num_cpus-1.13.0
+	ppv-lite86-0.2.10
+	predicates-2.0.0
+	predicates-core-1.0.2
+	predicates-tree-1.0.2
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	rayon-1.5.1
+	rayon-core-1.9.1
+	redox_syscall-0.2.9
+	regex-1.5.4
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	scopeguard-1.1.0
+	stfu8-0.2.4
+	strsim-0.8.0
+	tempfile-3.2.0
+	term_size-0.3.2
+	terminal_size-0.1.17
+	textwrap-0.11.0
+	thousands-0.2.0
+	treeline-0.1.0
+	unicode-width-0.1.8
+	vec_map-0.8.2
+	wait-timeout-0.2.0
+	wasi-0.10.2+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A more intuitive version of du"
+HOMEPAGE="https://github.com/bootandy/dust"
+SRC_URI="https://github.com/bootandy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Prevent portage from trying to fetch bunch of *.crate from mirror despite they are not mirrored.
+#
+# Specifying `test` to ignore failing tests.
+# See <https://github.com/bootandy/dust/issues/138>.
+RESTRICT="mirror test"
+
+QA_FLAGS_IGNORED="usr/bin/dust"
+
+src_install() {
+	cargo_src_install
+
+	dodoc README.md
+}
--- a/sys-cluster/SOS/Manifest
+++ b/sys-cluster/SOS/Manifest
@@ -0,0 +1 @@
+DIST SOS-1.5.0.tar.gz 544478 BLAKE2B f2a63fbf39958ac238e2d687d866c2f600956b933f956a4d8552acff29973de4d3e46a323b3f8eb3a63d395728cbafdfe119ea99d0fb5e17250d879ff269fb0e SHA512 0506bda8ab898cd1aaea82e230c64e17dde4ccfb3b70c9a4397c90d08643b3c7f96e7eae70e1a2b706b33737e979315372bcc338fc957652cd1b5e55d7a560ad
--- a/sys-cluster/SOS/SOS-1.5.0.ebuild
+++ b/sys-cluster/SOS/SOS-1.5.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED="fortran"
+
+inherit autotools fortran-2
+
+DESCRIPTION="implementation of the OpenSHMEM specification"
+HOMEPAGE="https://github.com/Sandia-OpenSHMEM/SOS"
+SRC_URI="https://github.com/Sandia-OpenSHMEM/SOS/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD public-domain mpich2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE_OFI_MR="
+	ofi-mr-basic
+	+ofi-mr-scalable
+	ofi-mr-rma-event
+"
+IUSE_TOTAL_DATA_ORDERING="
+	total-data-ordering-always
+	+total-data-ordering-check
+	total-data-ordering-never
+"
+IUSE_EXPAND="OFI_MR TOTAL_DATA_ORDERING"
+IUSE="${IUSE_OFI_MR} ${IUSE_TOTAL_DATA_ORDERING} av-map bounce-buffers cma completion-polling cxx
+debug error-checking fortran long-fortran-header manual-progress memcpy ofi ofi-fence openmp
+pmi-mpi pmi-simple portals4 profiling pthread-mutexes remote-virtual-addressing threads
+thread-completion ucx xpmem"
+
+RDEPEND="
+	ofi? ( sys-block/libfabric )
+	pmi-simple? ( sys-cluster/pmix[pmi] )
+	pmi-mpi? ( virtual/mpi )
+	portals4? ( sys-cluster/portals4 )
+	ucx? ( sys-cluster/ucx )
+	xpmem? ( sys-kernel/xpmem )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	^^ ( ${IUSE_OFI_MR/+/} )
+	^^ ( ${IUSE_TOTAL_DATA_ORDERING/+/} )
+	^^ ( pmi-mpi pmi-simple )
+	?? ( cma xpmem )
+	?? ( ofi portals4 )
+"
+
+pkg_setup() {
+	FORTRAN_NEED_OPENMP=0
+	use openmp && FORTRAN_NEED_OPENMP=1
+
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	#copied from bootstrap
+	if [[ ! -d ./config ]]; then
+		mkdir ./config || die
+	fi
+	FILES=./man/*.1
+	echo -n "dist_man1_MANS =" > ./man/Makefile.am || die
+	for f in $FILES
+	do
+		echo -n " $(basename $f)" >> ./man/Makefile.am || die
+	done
+	FILES=./man/*.3
+	echo -e -n "\ndist_man3_MANS =" >> ./man/Makefile.am || die
+	for f in $FILES
+	do
+		echo -n " $(basename $f)" >> ./man/Makefile.am || die
+	done
+	echo -e "\n" >> ./man/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local ofimr
+	use ofi-mr-basic && ofimr="basic"
+	use ofi-mr-scalable && ofimr="scalable"
+	use ofi-mr-rma-event && ofimr="rma-event"
+
+	local tda
+	use total-data-ordering-always && tda="always"
+	use total-data-ordering-check && tda="check"
+	use total-data-ordering-never && tda="never"
+
+	local myconf=(
+		--disable-picky
+		--disable-rpm-prefix
+		--enable-ofi-mr="${ofimr}"
+		--enable-total-data-ordering="${tda}"
+		$(use_enable av-map)
+		$(use_enable bounce-buffers)
+		$(use_enable completion-polling)
+		$(use_enable cxx)
+		$(use_enable debug)
+		$(use_enable error-checking)
+		$(use_enable fortran)
+		$(use_enable long-fortran-header)
+		$(use_enable manual-progress)
+		$(use_enable memcpy)
+		$(use_enable ofi-fence)
+		$(use_enable openmp)
+		$(use_enable pmi-mpi)
+		$(use_enable pmi-simple)
+		$(use_enable profiling)
+		$(use_enable pthread-mutexes)
+		$(use_enable remote-virtual-addressing)
+		$(use_enable threads)
+		$(use_enable thread-completion)
+
+		$(use_with cma)
+		$(use_with ofi)
+		$(use_with pmi-mpi pmi)
+		$(use_with portals4)
+		$(use_with ucx)
+		$(use_with xpmem)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-cluster/SOS/metadata.xml
+++ b/sys-cluster/SOS/metadata.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="av-map">enable av-map instead of av-table in the OFI transport</flag>
+		<flag name="bounce-buffers">Enable bounce buffers by default</flag>
+		<flag name="cma">Use cross-memory attach for on-node communication</flag>
+		<flag name="completion-polling">Enable polling in quiet, fence, and local completion operations</flag>
+		<flag name="cxx">Enable C++ bindings</flag>
+		<flag name="error-checking">Enable error checking in SHMEM calls.  This will increase the overhead of communication operations.</flag>
+		<flag name="fortran">Enable fortran bindings</flag>
+		<flag name="long-fortran-header">Enable long Fortran header, including all function declarations</flag>
+		<flag name="manual-progress">Enable intermittent progress calls inside transport layer</flag>
+		<flag name="memcpy">Use memcpy to perform local put/get operations</flag>
+		<!--<flag name="nonblocking-fence">By default, shmem_fence() is equivalent to shmem_quiet(), which can be a lengthy operation.  Enabling this feature results in the ordering point being moved from the shmem_fence() to the next put-like call, which can help improve overlap in some cases.</flag>-->
+		<flag name="ofi">Use libfabric as transport layer</flag>
+		<flag name="ofi-fence">Use FI_FENCE feature to optimize put-with-signal operations</flag>
+		<flag name="ofi-mr-basic">OFI memory registration mode: basic</flag>
+		<flag name="ofi-mr-rma-event">The OFI transport will use FI_MR_RMA_EVENT</flag>
+		<flag name="ofi-mr-scalable">The OFI transport will use FI_MR_SCALABLE</flag>
+		<flag name="pmi-mpi">Use MPI for process management</flag>	
+		<flag name="pmi-simple">Include support for interfacing with a PMI 1.0 launcher.  The launcher must be provided by a separate package, such as MPICH, Hydra, or SLURM.</flag>	
+		<flag name="portals4">Use portals4 as transport layer</flag>
+		<flag name="profiling">Enable profiling (pshmem) interface</flag>
+		<flag name="pthread-mutexes">Use pthread mutexes instead of internal queueing locks</flag>
+		<flag name="remote-virtual-addressing"> Enable optimizations assuming the symmetric heap is always symmetric with regards to virtual address. This may cause applications to abort during shmem_init() if such a symmetric heap can not be created, but will reduce the instruction count for some operations. This optimization also requires that the Portals 4 implementation support BIND_INACCESSIBLE on LEs.  This optimization will reduce the overhead of communication calls.</flag>
+		<flag name="thread-completion">Support SHMEM_THREAD_MULTIPLE in OFI transport using FI_THREAD_COMPLETION thread safety model instead of FI_THREAD_SAFE</flag>
+		<flag name="threads">Enable threading support</flag>
+		<flag name="total-data-ordering-always">Always assume total data ordering is available and abort a job if that's not the case</flag>
+		<flag name="total-data-ordering-check">Check will result in slightly higher overhead but will provide a fallback if the network doesn't provide total data ordering</flag>
+		<flag name="total-data-ordering-never">Never use total data ordering optimizations</flag>
+		<flag name="ucx">Use ucx transport</flag>
+		<flag name="xpmem">Use xpmem transport</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/Sandia-OpenSHMEM/SOS/issues</bugs-to> 
+		<remote-id type="github">Sandia-OpenSHMEM/SOS</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/sys-cluster/extrae/extrae-3.8.3-r9.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r9.ebuild
@@ -15,14 +15,15 @@ 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 +parallel-merge
-pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml"
+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"

 #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 openshmem gm mx aspectj
+#TODO: pmapi cuda cupti gm mx aspectj
 #TODO: support llvm libunwind, llvm rt, elftoolchain

 CDEPEND="
@@ -48,6 +49,7 @@ CDEPEND="
 	memkind? ( dev-libs/memkind )
 	online? ( sys-cluster/synapse )
 	opencl? ( dev-util/opencl-headers )
+	openshmem? ( sys-cluster/SOS )
 	sionlib? ( sys-cluster/sionlib:= )
 	spectral? (
 		sci-libs/fftw
@@ -106,7 +108,6 @@ src_configure() {
 		--with-unwind="${EPREFIX}/usr"

 		--without-cupti
-		--without-openshmem
 		--without-gm
 		--without-mx

@@ -175,6 +176,11 @@ src_configure() {
 	else
 		myconf+=( "--without-opencl" )
 	fi
+	if use openshmem; then
+		myconf+=( "--with-openshmem=${EPREFIX}/usr" )
+	else
+		myconf+=( "--without-openshmem" )
+	fi
 	if use sionlib; then
 		myconf+=( "--with-sionlib=${EPREFIX}/usr" )
 		myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlib" )
--- a/sys-cluster/extrae/metadata.xml
+++ b/sys-cluster/extrae/metadata.xml
@@ -34,6 +34,7 @@ process). Extrae generates trace files that can be later visualized with sys-clu
 		<flag name="online">Enable on-line analysis</flag>
 		<flag name="opencl">Enable support for tracing OpenCL</flag>
 		<flag name="openmp">Enable support for tracing OpenMP</flag>
+		<flag name="openshmem">OpenSHMEM to be used for the instrumentation package</flag>
 		<flag name="parallel-merge">Build the parallel mergers (mpimpi2prv/mpimpi2dim) based on MPI</flag>
 		<flag name="pebs-sampling">enable PEBS sampling</flag>
 		<!--<flag name="pmapi">Enable PMAPI library to gather CPU performance counters</flag>-->
--- a/sys-fs/diskonaut/metadata.xml
+++ b/sys-fs/diskonaut/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
    <maintainer type="person">
        <email>coppens.matthias.abc@gmail.com</email>
-        <description>Matthias Coppens</description>
+        <name>Matthias Coppens</name>
    </maintainer>
    <longdescription lang="en">
        Given a path on your hard-drive (which could also be the root path,
--- a/sys-kernel/xpmem/xpmem-2.6.3_p20210217.ebuild
+++ b/sys-kernel/xpmem/xpmem-2.6.3_p20210217.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

-inherit autotools linux-mod
-
 MODULES_OPTIONAL_USE="modules"
+MODULES_OPTIONAL_USE_IUSE_DEFAULT=1
 MY_REV="242eaa1eca92567c2118afe21e37cafc524f9166"

+inherit autotools linux-mod
+
 DESCRIPTION="Linux Cross-Memory Attach"
 HOMEPAGE="https://github.com/hjelmn/xpmem"
 SRC_URI="https://github.com/hjelmn/xpmem/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
@@ -16,7 +17,6 @@ S="${WORKDIR}/${PN}-${MY_REV}"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+modules"

 MODULE_NAMES="xpmem(misc:${WORKDIR}/module/kernel:${WORKDIR}/module/kernel)"
 BUILD_TARGETS="all"
--- a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
+++ b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
@@ -21,15 +21,15 @@ SLOT="0"
 IUSE=""

 BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="dev-libs/glib:2"
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-misc/rofi
+"
 DEPEND="
 	${COMMON_DEPEND}
 	x11-libs/cairo
 "
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-misc/rofi
-"
+RDEPEND="${COMMON_DEPEND}"

 PATCHES=(
 	"${FILESDIR}/${P}-do-not-install-man-page.patch"
--- a/x11-misc/xbanish/xbanish-1.7.ebuild
+++ b/x11-misc/xbanish/xbanish-1.7.ebuild
@@ -18,12 +18,15 @@ SLOT="0"
 IUSE=""

 # NOTE: x11-libs/libXext might become a dep next version (1.7+)
-DEPEND="
+RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXfixes
 	x11-libs/libXi
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libXt
+"

 src_configure() {
 	# Makefile doesn't respect user's LDFLAGS
--- a/x11-themes/obsidian2-gtk-theme/metadata.xml
+++ b/x11-themes/obsidian2-gtk-theme/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>vowstar@gmail.com</email>
+		<name>Huang Rui</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">madmaxms/theme-obsidian-2</remote-id>
				`@@ -0,0 +1 @@`
				`DIST akita-0.1.4.tar.gz 212866 BLAKE2B d6a32943eff8eb110fd4026378ecf04443a0792386ad755e28efeeba983f501f735bdae93bf798413caddec30764c9b6a2521d605e88f84a15081994361ce3ad SHA512 aeb5f6c21b4cb69c9adf58516db6ad951db562f5a12ff71f3816b9a962c4c2503120f6140f53b82893c441565676f3bc41a19ea2301728502d5a2c191372fdba`
				`@@ -0,0 +1 @@`
				`DIST anarchism-15.3.tar.gz 8160295 BLAKE2B 522a2314e6c208a258104412b7620061f952c1a969a11a432cc14bc1a7037d89e0953e82033a9811d461831f9f30c9d0e1924b94e3b8e7deb33e44578ce3f80b SHA512 e0df7ddb8b042eceebf701ec7f8ff9344dc8abefbf2d13f9cf6615c06ff1250f0398ecc281f7c9e77ca49a15f86f04dfdd2f8ad50dc2062223df1c4231736046`
				`@@ -0,0 +1 @@`
				`DIST got-0_p20210217.tar.gz 517647 BLAKE2B 4b4f5436c5804aa60038d737de883eb69ce4d4f0f705f7d310722222da38b917d577a09fb37b2317c1a34b1a0aa2b0fe00cf07dcbb350a901fe50dbb31ca6ede SHA512 fb3c60b5d1036d735e775e362c7349720bfeae62c1e8b830417b5edd57c86546a97113f6b10b742b1b3b6146d0a7e41906042c1008551b4d15e2bd0331c7ab2f`
				`@@ -0,0 +1 @@`
				`DIST SOS-1.5.0.tar.gz 544478 BLAKE2B f2a63fbf39958ac238e2d687d866c2f600956b933f956a4d8552acff29973de4d3e46a323b3f8eb3a63d395728cbafdfe119ea99d0fb5e17250d879ff269fb0e SHA512 0506bda8ab898cd1aaea82e230c64e17dde4ccfb3b70c9a4397c90d08643b3c7f96e7eae70e1a2b706b33737e979315372bcc338fc957652cd1b5e55d7a560ad`