Merge updates from master

2026-07-20 12:33:40 -04:00 · 2021-01-23 12:38:51 +00:00
parent b80b728538 ad518797f2
commit a39c6f3d3e
43 changed files with 428 additions and 121 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+tab_width = 4
+charset = utf-8
+
+[*.ebuild]
+indent_style = tab
+trim_trailing_whitespace = true
+
+[repositories.xml]
+indent_style = space
+tab_width = 2
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -28,4 +28,4 @@ jobs:
        sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
    - name: Test with pkgcheck
      run: |
-        pkgcheck scan --exit --check=-RedundantVersionCheck,-VisibilityCheck
+        pkgcheck scan --exit --check=-RedundantVersionCheck,-VisibilityCheck,-AcctCheck
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,15 @@
+*.log
 *.swp
 *~
 ,*
 .idea/
+.vs/
 .vscode/
 .~lock.*
 /.ebuild.x
 /distfiles/
 /eclass/*.5
 /local/
+/metadata/md5-cache
 /packages/
 /profiles/use.local.desc
--- a/app-editors/vscodium-bin/Manifest
+++ b/app-editors/vscodium-bin/Manifest
@@ -1,2 +1,3 @@
 DIST VSCodium-linux-arm64-1.52.1.tar.gz 99006948 BLAKE2B 933e5b283e011873b7da60a838e7778d8ff1cf69006e5bf370fdeba7aa6709c2b8ea427936d353c75c0331d1a78defb7c0983d73d59c71163cde6ca32cf1ac32 SHA512 e96c79b1176a07f6cbd1a1d30d4a4d0d66d519d854bc0aa0e24e9baa4b0f6fe959e12b4888330188210957763febc644601f958b635deaa7e900f55f0eb5550f
+DIST VSCodium-linux-armhf-1.52.1.tar.gz 85288104 BLAKE2B 3df56d4708f44e5029a9cfed05185957951ead696885f16e8d3da8587f812f9e088e37e2b355157989a0e272661f367a1bd2d70cfbc7953a1f07f166b7b8292d SHA512 ffd5b2b476896d4aed67ed0bd157ca14819f493534c9e15eba247998becb06042c6c0caa88ee2db7e76529da252dac57c43c86371430b57a5819ce392cdcdcb5
 DIST VSCodium-linux-x64-1.52.1.tar.gz 96026417 BLAKE2B 0d06ddef0de3af3d22de4757bd5b81742cdfb6605192c61374857fdacfd8df374adf180aaa1f31f0397ead97e7f668320125ef1f806c71689348ac4a3c8bab8d SHA512 9a60f6821e7a796eaca842817fd3853c8099d74418ccabeacabed01c4f7b46b49c52bb11a032c317c27e3cef7ef2c49d2cf967ca2d2d79013790994a6aa9159f
--- a/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
+++ b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
@@ -13,6 +13,9 @@ SRC_URI="
 	amd64? (
 		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz
 	)
+	arm? (
+		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz
+	)
 	arm64? (
 		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz
 	)
@@ -21,14 +24,13 @@ SRC_URI="
 RESTRICT="bindist strip test"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="libsecret"

 RDEPEND="
 	app-accessibility/at-spi2-atk
 	dev-libs/nss
 	media-libs/libpng:0/16
-	sys-apps/ripgrep
 	x11-libs/cairo
 	x11-libs/gtk+:3
 	x11-libs/libXScrnSaver
@@ -36,6 +38,8 @@ RDEPEND="
 	x11-libs/libnotify
 	x11-libs/pango
 	libsecret? ( app-crypt/libsecret[crypt]	)
+	amd64? ( sys-apps/ripgrep )
+	arm64? ( sys-apps/ripgrep )
 "

 S="${WORKDIR}"
@@ -43,8 +47,10 @@ S="${WORKDIR}"
 src_prepare() {
 	default

-	# Unbundle ripgrep
-	rm "resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" || die
+	# Unbundle ripgrep on amd64 & arm64
+	if use amd64 || use arm64; then
+		rm "resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" || die
+	fi
 }

 src_install() {
@@ -60,7 +66,10 @@ src_install() {
 	fperms +x /opt/${MY_PN}/chrome-sandbox
 	fperms -R +x /opt/${MY_PN}/resources/app/out/vs/base/node

-	dosym "../../../../../../../usr/bin/rg" "${EPREFIX}/opt/${MY_PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	if use amd64 || use arm64; then
+		dosym "../../../../../../../usr/bin/rg" "${EPREFIX}/opt/${MY_PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	fi
+
 	dodoc resources/app/LICENSE.txt resources/app/ThirdPartyNotices.txt
 	newicon resources/app/resources/linux/code.png ${MY_PN}.png
 }
--- a/dev-R/cellranger/metadata.xml
+++ b/dev-R/cellranger/metadata.xml
@@ -5,9 +5,6 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<longdescription lang="en">
-		Helper functions to work with spreadsheets and the "A1:D10" style of cell range specification.
-	</longdescription>
 	<upstream>
 		<bugs-to>
 			https://github.com/rsheets/cellranger/issues
--- a/dev-R/dplyr/metadata.xml
+++ b/dev-R/dplyr/metadata.xml
@@ -5,9 +5,6 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<longdescription lang="en">
-		A fast, consistent tool for working with data frame like objects, both in memory and out of memory.
-	</longdescription>
 	<upstream>
 		<bugs-to>
 			https://github.com/tidyverse/dplyr/issues
--- a/dev-R/purrr/metadata.xml
+++ b/dev-R/purrr/metadata.xml
@@ -5,9 +5,6 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<longdescription lang="en">
-		A complete and consistent functional programming toolkit for R.
-	</longdescription>
 	<upstream>
 		<bugs-to>
 			https://github.com/tidyverse/purrr/issues
--- a/dev-libs/mtxclient/Manifest
+++ b/dev-libs/mtxclient/Manifest
@@ -1,2 +1,2 @@
-DIST mtxclient-0.3.0.tar.gz 507299 BLAKE2B 4c36762a3a0a3aafebd414d2c967cc5183710c7be34df9b50078538e7971e86182114ed310ed96a452a02f3d8c1c18fa5aa0de414d0c391d97efb1ce7f1b49f9 SHA512 113eb2c1042e0aeea6607fae0b7fd0ff1655d6b902fa11a3492561c53240901e641f53d413810e932ac210e519026016c5fac38bda1592336c95b2d79781557e
 DIST mtxclient-0.3.1.tar.gz 511985 BLAKE2B 5271dc755ea10be2bddd0155b9c3288be2f0cb165989fdebcf237795a12041e8f21f7c54b9f7ec86e5fa08c386daad696f77509ae65b2aa2c30c9a292bb1b682 SHA512 ed4991b0a611be80cef42dec5e4b747787dae6aeaf46dc1cc395b06233efc9a5b1b57b1809eb9dacd7893b4de19f43996bb6d4556fc67697013248d79528a567
+DIST mtxclient-0.4.0.tar.gz 571434 BLAKE2B d836d94f9045f0ca5a0aa9b5fe6f3643e3189d4ee31b797472aca10320678308d51e2c9bc37f4234d00e0c201aeefaf8c4c40072b0ad8c7f5b6a9e0c10163a2a SHA512 8c3538147b9277babbac14aaec6652ff638ae9335c01f786dfec78e3edc5c23591da8ce33c4366329050cf644f71a9fac8d337a2a9fbf7ea2883be05f6ac1a1e
--- a/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
+++ b/dev-libs/mtxclient/files/0.3.0_add_missing_header.patch
@@ -1,22 +0,0 @@
-From 3692a1dce868cfde29547757b6a8e91a05761b12 Mon Sep 17 00:00:00 2001
-From: Nicolas Werner <nicolas.werner@hotmail.de>
-Date: Sat, 9 May 2020 00:33:29 +0200
-Subject: [PATCH] gcc 10 fixes
-
---
- include/mtx/identifiers.hpp | 2 ++
- tests/messages.cpp          | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/mtx/identifiers.hpp b/include/mtx/identifiers.hpp
-index a18b26e9..077099c4 100644
--- a/include/mtx/identifiers.hpp
-+++ b/include/mtx/identifiers.hpp
-@@ -6,4 +6,6 @@
- #include <nlohmann/json.hpp>
- #endif
-
-+#include <stdexcept>
-+
- namespace mtx {
- namespace identifiers {
--- a/dev-libs/mtxclient/mtxclient-0.4.0.ebuild
+++ b/dev-libs/mtxclient/mtxclient-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -15,10 +15,9 @@ IUSE="test"
 KEYWORDS="~amd64"

 RDEPEND="
-	dev-libs/libsodium
 	>=dev-libs/boost-1.70.0
 	dev-libs/olm
-	dev-libs/openssl
+	>=dev-libs/openssl-1.1.0
 	dev-cpp/nlohmann_json
 "
 DEPEND="
@@ -31,7 +30,6 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/0.3.0_remove_network_tests.patch"
 	"${FILESDIR}/0.3.0_remove_failing_tests.patch"
-	"${FILESDIR}/0.3.0_add_missing_header.patch"
 )

 src_configure() {
@@ -40,13 +38,5 @@ src_configure() {
 		-DBUILD_LIB_EXAMPLES=OFF
 	)

-	if use test; then
-		# Upstream uses a toolchain file to set these, fixed in >0.3.0.
-		mycmakeargs+=(
-			-DCMAKE_CXX_STANDARD=17
-			-DCMAKE_CXX_STANDARD_REQUIRED=ON
-		)
-	fi
-
 	cmake_src_configure
 }
--- a/dev-libs/open62541/Manifest
+++ b/dev-libs/open62541/Manifest
@@ -1,2 +1,2 @@
-DIST open62541-1.0.3.tar.gz 2691597 BLAKE2B 0ad9f71f97dfe550068d239cc97f59afd1f528a1b912d44734103a962fd3407ac9b3d753cc1499dbf5b7ad0f56a93378b5c833ac24262b1f9eb26916de296904 SHA512 5dfff3d784b1659a5c819b7666101e60af186e7604ca73e6c3ec15d20e8ceff26f1c9139bb78bf0c0fbc9ab10a1a3cd031252e1e6bf1f56c5403797257a318cf
-DIST open62541-1.1.3.tar.gz 2925631 BLAKE2B 1314d51c1153a2e2785e8eccf363ef8285142b0e2af1890047eae079bd6d36583c0fa91661da4bf68c1dfa980c6b708fa7c6f7192bea06b234b98428074fd1c8 SHA512 e0574b9273002b22c042534dc8e177800bee87f8b48d3de4a627dc255211e67489531905cac41a8a15d337e2a958815b59be23c96163d3305cd43a8da18c390f
+DIST open62541-1.0.6.tar.gz 2691627 BLAKE2B 72a0eb5870bf4233ac6f3911c1a7ad95d4cfa1c26be581815e99189206e188beedc1c2c81ea4cbd038ef545b9548949735353a550bb54ca6a7fb6a6fd60ffa65 SHA512 f317476e19fd2cc1cbd9155e2fe8bcac6499758f35a2f4eb59403add7d66ef94d45bae06bc8ece79eedceef1d0a364565d567b97e94da6b333591f4347961955
+DIST open62541-1.1.5.tar.gz 2925670 BLAKE2B 5da0795801f2fd92fd3d922fbda83d8ef6f22f19a9e17d585fd2f9dddf37e3fc95290ac3d49774ebad0bee8114f5bec4af11d01998ba765b93311062681c7114 SHA512 46379047c83bd728343c4d5b78bf5ade02bd9af4c430350d54366aeab66dadfaee2bded317e990b2456d98dd7277877824e6ad3c632d62c94ba50b14433ea880
--- a/dev-libs/open62541/files/open62541-1.0.6-tests.patch
+++ b/dev-libs/open62541/files/open62541-1.0.6-tests.patch
@@ -18,10 +18,10 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 tests/CMakeLists.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 8f498e7911fa..853e535eeaa7 100644
--- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
+Index: open62541/tests/CMakeLists.txt
+===================================================================
+--- open62541.orig/tests/CMakeLists.txt
+++ open62541/tests/CMakeLists.txt
@@ -255,20 +255,20 @@ if(UA_ENABLE_PUBSUB)
     add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
     target_link_libraries(check_pubsub_connection_udp ${LIBS})
@@ -55,6 +55,3 @@ index 8f498e7911fa..853e535eeaa7 100644
 
     add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-plugins>)
     target_link_libraries(check_pubsub_multiple_layer ${LIBS})
-- 
-2.24.1
-
--- a/dev-libs/open62541/files/open62541-1.1.5-etf.patch
+++ b/dev-libs/open62541/files/open62541-1.1.5-etf.patch
@@ -25,11 +25,11 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 plugins/ua_pubsub_ethernet_etf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/plugins/ua_pubsub_ethernet_etf.c b/plugins/ua_pubsub_ethernet_etf.c
-index 416b5857945a..d55eb363e3b5 100644
--- a/plugins/ua_pubsub_ethernet_etf.c
-+++ b/plugins/ua_pubsub_ethernet_etf.c
-@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const UA_PubSubConnectionConfig *connectionConf
+Index: open62541/plugins/ua_pubsub_ethernet_etf.c
+===================================================================
+--- open62541.orig/plugins/ua_pubsub_ethernet_etf.c
+++ open62541/plugins/ua_pubsub_ethernet_etf.c
+@@ -186,7 +186,7 @@ UA_PubSubChannelEthernetETF_open(const U
     struct ifreq ifreq;
     memset(&ifreq, 0, sizeof(struct ifreq));
     UA_UInt64 len = UA_MIN(address->networkInterface.length, sizeof(ifreq.ifr_name)-1);
@@ -38,6 +38,3 @@ index 416b5857945a..d55eb363e3b5 100644
                 "%.*s", (int)len,
                 (char*)address->networkInterface.data);
 
-- 
-2.26.2
-
--- a/dev-libs/open62541/files/open62541-1.1.5-headers.patch
+++ b/dev-libs/open62541/files/open62541-1.1.5-headers.patch
@@ -11,11 +11,11 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d7417c88088b..8f87c5d998c6 100755
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -861,6 +861,7 @@ if(UA_ENABLE_PUBSUB)
+Index: open62541/CMakeLists.txt
+===================================================================
+--- open62541.orig/CMakeLists.txt
+++ open62541/CMakeLists.txt
+@@ -877,6 +877,7 @@ if(UA_ENABLE_PUBSUB)
     list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
     list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
     if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
@@ -23,7 +23,7 @@ index d7417c88088b..8f87c5d998c6 100755
         list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c)
     endif()
     if(UA_ENABLE_PUBSUB_ETH_UADP)
-@@ -870,6 +871,7 @@ if(UA_ENABLE_PUBSUB)
+@@ -886,6 +887,7 @@ if(UA_ENABLE_PUBSUB)
     if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
         if(EXISTS "${XDP_LIBRARY}")
             list(APPEND open62541_LIBRARIES ${XDP_LIBRARY})
@@ -31,6 +31,3 @@ index d7417c88088b..8f87c5d998c6 100755
             list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c)
         else()
             MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP")
-- 
-2.26.2
-
--- a/dev-libs/open62541/files/open62541-1.1.5-tests.patch
+++ b/dev-libs/open62541/files/open62541-1.1.5-tests.patch
@@ -10,10 +10,10 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
 tests/CMakeLists.txt | 78 --------------------------------------------
 1 file changed, 78 deletions(-)

-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index c73b2b04520b..fb21fb856ba4 100644
--- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
+Index: open62541/tests/CMakeLists.txt
+===================================================================
+--- open62541.orig/tests/CMakeLists.txt
+++ open62541/tests/CMakeLists.txt
@@ -331,84 +331,6 @@ if(UA_ENABLE_DISCOVERY)
     add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery)
 endif()
@@ -99,6 +99,3 @@ index c73b2b04520b..fb21fb856ba4 100644
 add_executable(check_server_readspeed server/check_server_readspeed.c $<TARGET_OBJECTS:open62541-object> $<TARGET_OBJECTS:open62541-testplugins>)
 target_link_libraries(check_server_readspeed ${LIBS})
 add_test_no_valgrind(server_readspeed ${TESTS_BINARY_DIR}/check_server_readspeed)
-- 
-2.26.2
-
--- a/dev-libs/open62541/open62541-1.0.6.ebuild
+++ b/dev-libs/open62541/open62541-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/dev-libs/open62541/open62541-1.1.5.ebuild
+++ b/dev-libs/open62541/open62541-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/gui-apps/sfwbar/Manifest
+++ b/gui-apps/sfwbar/Manifest
@@ -1 +1,2 @@
 DIST sfwbar-0.9.4.tar.gz 90159 BLAKE2B c1f0fdd77469c231f8bb7e0862049979354e076427ad08ca5fe6383fac44b424b5583041a21425bfaa490f872fa0757214e7796d187f9fc7cb62b22d6b65c039 SHA512 e2cbe1bb6f89dd9632e21d9f008267bae2ef62c63e54021c791d3f24c09c817b3670509d3be29a23795c50e63e78330fdbbc1ab6b527c012585e28950958171d
+DIST sfwbar-0.9.6.tar.gz 94580 BLAKE2B faf6c4fc1e78cc8362e9acbdef6860f766e18bee0f8fa5e7d658fdfbd39cc786ac8c1266554ecc7d3de4d9a81b52760acc3b1dbc947d76e11c862aac2254582e SHA512 37045491bdd6389401f9fb2daec48fa361bb60aea340b56c9c05692614407d3f4a94c73d4800d20bd78a58531570a8114a0aa7dbbb506e06b029f8c82f9ffb99
--- a/gui-apps/sfwbar/sfwbar-0.9.6.ebuild
+++ b/gui-apps/sfwbar/sfwbar-0.9.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Sway Floating Window Bar"
+HOMEPAGE="https://github.com/LBCrion/sfwbar"
+SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
+	gui-libs/gtk-layer-shell
+	dev-libs/libucl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
--- a/gui-libs/libcprime/libcprime-4.0.0.ebuild
+++ b/gui-libs/libcprime/libcprime-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,13 +8,13 @@ QTMIN="5.15.1"
 inherit multilib qmake-utils xdg

 DESCRIPTION="Library for managing settings of CoreApps"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcprime"
+HOMEPAGE="https://gitlab.com/cubocore/libcprime"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/coreapps/${PN}.git"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/cubocore/coreapps/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/cubocore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
--- a/gui-libs/libcprime/libcprime-4.1.0.ebuild
+++ b/gui-libs/libcprime/libcprime-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,13 +8,13 @@ QTMIN="5.15.1"
 inherit multilib qmake-utils xdg

 DESCRIPTION="Library for managing settings of CoreApps"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcprime"
+HOMEPAGE="https://gitlab.com/cubocore/libcprime"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/coreapps/${PN}.git"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/cubocore/coreapps/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/cubocore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
--- a/gui-libs/libcsys/libcsys-4.0.0.ebuild
+++ b/gui-libs/libcsys/libcsys-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,13 +8,13 @@ QTMIN="5.15.1"
 inherit multilib qmake-utils

 DESCRIPTION="Library for managing the device"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcsys"
+HOMEPAGE="https://gitlab.com/cubocore/libcsys"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/coreapps/${PN}.git"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/cubocore/coreapps/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/cubocore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
--- a/gui-libs/libcsys/libcsys-4.1.0.ebuild
+++ b/gui-libs/libcsys/libcsys-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,13 +8,13 @@ QTMIN="5.15.1"
 inherit multilib qmake-utils

 DESCRIPTION="Library for managing the device"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcsys"
+HOMEPAGE="https://gitlab.com/cubocore/libcsys"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/coreapps/${PN}.git"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/cubocore/coreapps/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/cubocore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
--- a/gui-libs/libcsys/libcsys-9999.ebuild
+++ b/gui-libs/libcsys/libcsys-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -8,13 +8,13 @@ QTMIN="5.15.1"
 inherit multilib qmake-utils

 DESCRIPTION="Library for managing the device"
-HOMEPAGE="https://gitlab.com/cubocore/coreapps/libcsys"
+HOMEPAGE="https://gitlab.com/cubocore/libcsys"

 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/cubocore/coreapps/${PN}.git"
+	EGIT_REPO_URI="https://gitlab.com/cubocore/${PN}.git"
 else
-	SRC_URI="https://gitlab.com/cubocore/coreapps/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/cubocore/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
--- a/media-gfx/silicon/files/rust-xcb-0.8.2-python-3.9.patch
+++ b/media-gfx/silicon/files/rust-xcb-0.8.2-python-3.9.patch
@@ -0,0 +1,43 @@
+From b41c79a73069160af5290c328acecd499f5d216a Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <michel@michel-slm.name>
+Date: Mon, 8 Jun 2020 22:59:11 -0700
+Subject: [PATCH] Use `ElementTree` instead of `cElementTree`
+
+`cElementTree` has been deprecated since Python 3.3; `ElementTree` will use a fast implementation whenever available.
+
+`cElementTree` is actually removed as of Python 3.9 beta 1, and on Python 3.8 it's an alias to `ElementTree`.
+
+See https://docs.python.org/3.8/library/xml.etree.elementtree.html
+
+Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
+---
+ xcbgen/matcher.py | 2 +-
+ xcbgen/state.py   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py
+index bfa315eb..97ae5f9f 100644
+--- a/xcbgen/matcher.py
+++ b/xcbgen/matcher.py
+@@ -7,7 +7,7 @@
+ '''
+ 
+ from os.path import join
+-from xml.etree.cElementTree import parse
+from xml.etree.ElementTree import parse
+ 
+ from xcbgen.xtypes import *
+ 
+diff --git a/xcbgen/state.py b/xcbgen/state.py
+index 1f5479e9..95af5a40 100644
+--- a/xcbgen/state.py
+++ b/xcbgen/state.py
+@@ -2,7 +2,7 @@
+ This module contains the namespace class and the singleton module class.
+ '''
+ from os.path import dirname, basename
+-from xml.etree.cElementTree import parse
+from xml.etree.ElementTree import parse
+ 
+ from xcbgen import matcher
+ from xcbgen.error import *
--- a/media-gfx/silicon/silicon-0.4.0.ebuild
+++ b/media-gfx/silicon/silicon-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 # Auto-Generated by cargo-ebuild 0.3.1
@@ -176,7 +176,9 @@ xcb-0.8.2
 xml-rs-0.8.3
 "

-inherit cargo
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cargo python-any-r1

 DESCRIPTION="Create beautiful image of your code"
 HOMEPAGE="https://github.com/Aloxaf/silicon"
@@ -188,12 +190,9 @@ LICENSE="Apache-2.0 Boost-1.0 BSD-2 CC0-1.0 MIT MPL-2.0 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-# Python 3.9 cannot be used for now.
-# See <https://github.com/rtbo/rust-xcb/issues/84>
-# (fixed but not yet released).
 BDEPEND="
-	<dev-lang/python-3.9
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	${PYTHON_DEPS}"
 DEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
@@ -201,6 +200,13 @@ DEPEND="
 RDEPEND="${DEPEND}
 	x11-misc/xclip"

+src_unpack() {
+	cargo_src_unpack
+
+	# Apply patch <https://github.com/rtbo/rust-xcb/pull/87> for python 3.9 support.
+	( cd "${WORKDIR}"/cargo_home/gentoo/xcb-0.8.2 && eapply "${FILESDIR}"/rust-xcb-0.8.2-python-3.9.patch )
+}
+
 src_install() {
 	cargo_src_install

--- a/net-im/nheko/Manifest
+++ b/net-im/nheko/Manifest
@@ -1,2 +1,2 @@
-DIST nheko-0.7.1.tar.gz 781856 BLAKE2B ebe4bc30b31c38f31dd732ebfeac6d79f3772a1de54ec3d46a0b3cf3622e6acbac574733da78420ece4030b0dee921f054f44ce9c2c159c67d94add1b2f3685b SHA512 c3f8325c865b4021709114ab7f658ae5198404242eb8761c8589d42b08d175323406a65ff0706b16a4139155ac7676e12282bce078cc0a02284ecd70a7d62bdc
 DIST nheko-0.7.2.tar.gz 899562 BLAKE2B 39a21c5a164cdc1090479422607297e48ca0e1d5455e3fabd4cf4e2af6ee8527409fbde58b0320ae0938757f055929ca5188e5b4bb9be3d1a2832d66914588a6 SHA512 8f253bdac22a2d3412fcb18671145d9601d8609dbc79358412e81a17a9677a1cb44b6fc4d029f4d850818cb3fe3531adc869a7e54273e7bb17d0aa7ef85dce17
+DIST nheko-0.8.0.tar.gz 1150754 BLAKE2B ef932f824a2e519514836aa1362504b11c4c9f511e8e66889008891cf5ac008442629afc56deb221dfaebda42c91c9c145f5e489733fee95838e100b4d4c5b77 SHA512 c427904bc846956aeda57ec6bc1bcf25962caa99f47da669c006d5adeb10b8b14c75aa98d9879fa91b558af8d0e9b475f52c60a1a3ee34b2cd5780f84130bcdb
--- a/net-im/nheko/nheko-0.8.0.ebuild
+++ b/net-im/nheko/nheko-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -23,8 +23,9 @@ RDEPEND="
 	app-text/cmark
 	dev-libs/tweeny
 	dev-db/lmdb++
-	>=dev-libs/mtxclient-0.3.0
+	>=dev-libs/mtxclient-0.4.0
 	dev-cpp/nlohmann_json
+	dev-libs/qtkeychain
 "
 DEPEND="
 	${RDEPEND}
@@ -35,6 +36,19 @@ BDEPEND="dev-qt/linguist-tools:5"
 src_prepare() {
 	cmake_src_prepare
 	xdg_src_prepare
-
-	# TODO: Unbundle SingleApplication, blurhash and cpp-httplib.
 }
+
+# # Preparation for when gstreamer >= 1.18 lands in ::gentoo.
+# MY_GSTREAMER_V="1.18"
+#
+#	voip? (
+#		>=media-libs/gstreamer-${MY_GSTREAMER_V}
+#		>=media-plugins/gst-plugins-meta-${MY_GSTREAMER_V}[opus,vpx]
+#		>=media-libs/gst-plugins-base-${MY_GSTREAMER_V}[opengl]
+#		>=media-libs/gst-plugins-good-${MY_GSTREAMER_V}
+#		>=media-libs/gst-plugins-bad-${MY_GSTREAMER_V}
+#		>=media-plugins/gst-plugins-dtls-${MY_GSTREAMER_V}
+#		>=media-plugins/gst-plugins-srtp-${MY_GSTREAMER_V}
+#		>=media-plugins/gst-plugins-webrtc-${MY_GSTREAMER_V}
+#		net-libs/libnice
+#	)
--- a/net-libs/kcgi/Manifest
+++ b/net-libs/kcgi/Manifest
@@ -0,0 +1 @@
+DIST kcgi-0.12.2.tgz 243979 BLAKE2B a142cf80ffc18677b245172d9af63104816eb12e377b99593186c7b8855459513c87c43eaa0ec38328684f17d22fae2b19c28bd30b5f4983ac538d43c7aabf52 SHA512 f28dd2134936036c44bbd3fc094e512c52019e0dc39f085a396924331c0e7f0bb940cee8afae43147674065b7d5a1d057c56cfdb0040131b72da53dff2289d31
--- a/net-libs/kcgi/kcgi-0.12.2.ebuild
+++ b/net-libs/kcgi/kcgi-0.12.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="minimal CGI library for web applications"
+HOMEPAGE="https://kristaps.bsd.lv/kcgi/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kristapsdz/kcgi"
+else
+	SRC_URI="https://kristaps.bsd.lv/kcgi/snapshots/${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-devel/bmake"
+DEPEND="
+	test? ( net-misc/curl[static-libs] )
+"
+
+src_configure() {
+	./configure PREFIX="${EPREFIX}/usr" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SBINDIR="${EPREFIX}/usr/bin" || die
+	echo 'LDADD_LIB_SOCKET += ${LDFLAGS}' >> Makefile.configure || die
+}
+
+src_compile() {
+	bmake -j$(makeopts_jobs) \
+		CC="$(tc-getCC)" || die
+}
+
+src_test() {
+	bmake -j$(makeopts_jobs) \
+		CC="$(tc-getCC)" regress || die
+}
+
+src_install() {
+	bmake -j$(makeopts_jobs) \
+		CC="$(tc-getCC)" \
+		DESTDIR="${D}" \
+		MANDIR=/usr/share/man \
+		install || die
+	find "${ED}/usr/$(get_libdir)" -name "*.a" -delete
+}
--- a/net-libs/kcgi/kcgi-9999.ebuild
+++ b/net-libs/kcgi/kcgi-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="minimal CGI library for web applications"
+HOMEPAGE="https://kristaps.bsd.lv/kcgi/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kristapsdz/kcgi"
+else
+	SRC_URI="https://kristaps.bsd.lv/kcgi/snapshots/${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-devel/bmake"
+DEPEND="
+	test? ( net-misc/curl[static-libs] )
+"
+
+src_configure() {
+	./configure PREFIX="${EPREFIX}/usr" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SBINDIR="${EPREFIX}/usr/bin" || die
+	echo 'LDADD_LIB_SOCKET += ${LDFLAGS}' >> Makefile.configure || die
+}
+
+src_compile() {
+	bmake -j$(makeopts_jobs) \
+		CC="$(tc-getCC)" || die
+}
+
+src_test() {
+	bmake -j$(makeopts_jobs) \
+		CC="$(tc-getCC)" regress || die
+}
+
+src_install() {
+	bmake -j$(makeopts_jobs) \
+		CC="$(tc-getCC)" \
+		DESTDIR="${D}" \
+		MANDIR=/usr/share/man \
+		install || die
+	find "${ED}/usr/$(get_libdir)" -name "*.a" -delete
+}
--- a/net-libs/kcgi/metadata.xml
+++ b/net-libs/kcgi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+</pkgmetadata>
--- a/net-misc/tootle/Manifest
+++ b/net-misc/tootle/Manifest
@@ -0,0 +1 @@
+DIST tootle-1.0_alpha2.tar.gz 794059 BLAKE2B 7dd03b8bdb3f8b9ae3758fc8c3e7f1fa3529ddc61cf3e281ed92330b89c99651e860d213cf1a3818abff24853b20a9562f46ac1c601e94537bf45940166a17aa SHA512 cb51fce1b439a0703be5e0c755aaebd4ad81b87252f19784cbec80ce3c43e94bfc72c5e205e9a016706a8edd4dfffc9ce0ecfddae4fc45f0edec85f5fca9dfcf
--- a/net-misc/tootle/metadata.xml
+++ b/net-misc/tootle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xgqt@protonmail.com</email>
+		<name>Maciej Barć</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bleakgrey/tootle</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/net-misc/tootle/tootle-1.0_alpha2.ebuild
+++ b/net-misc/tootle/tootle-1.0_alpha2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala meson gnome2-utils xdg
+
+DESCRIPTION="Mastodon client written in GTK3"
+HOMEPAGE="https://github.com/bleakgrey/tootle"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bleakgrey/${PN}.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/bleakgrey/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	gui-libs/libhandy:1
+	net-libs/libsoup:2.4
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+	default
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
--- a/net-misc/tootle/tootle-9999.ebuild
+++ b/net-misc/tootle/tootle-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala meson gnome2-utils xdg
+
+DESCRIPTION="Mastodon client written in GTK3"
+HOMEPAGE="https://github.com/bleakgrey/tootle"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bleakgrey/${PN}.git"
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/bleakgrey/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	gui-libs/libhandy:1
+	net-libs/libsoup:2.4
+	x11-libs/gtk+:3
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+	default
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
--- a/sci-electronics/verilator/Manifest
+++ b/sci-electronics/verilator/Manifest
@@ -1 +1 @@
-DIST verilator-4.106.tar.gz 2191982 BLAKE2B 9dbd0dad390b4a009a062a8405dc01a317fed68a2f0becd4bf088c566f2457a4cda04a4c276cf31cdbaa0efa6e64f5618b9439221f8cf4bb469f20f1de1af397 SHA512 b1840b294b22c0d4cf17a0a154e73a631c62b30055f324dca98839ab85e2a524f9e3b6e981b192b941c1dd9837f326ae38cc3fcf686c3f8731d376dc89dd46fe
+DIST verilator-4.108.tar.gz 2217541 BLAKE2B 52321477102f3762f3881b7b8ca38b7ffc6a19903f9f8091909d0bbe003fcb86c2bc0075249044b6483705d97fd2e85998e0d6b7b7c64c362a5224a4dc2ccbaf SHA512 a2e2f279f08c0781e3fa158923376574244052dc87a2d72ecd48d63efac3743e264a79f2121175a1766c7fb2fb56104e919baee75879a1e5c4c4a96dd22bfd91
--- a/sci-electronics/verilator/verilator-4.108.ebuild
+++ b/sci-electronics/verilator/verilator-4.108.ebuild
--- a/sys-fs/gcsfuse/Manifest
+++ b/sys-fs/gcsfuse/Manifest
@@ -24,7 +24,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb6
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.zip 404449 BLAKE2B e67aff98ecb8012e57b9841c0996b726e971360f34e4c5e8d6f61e3c27edcf7f1d0e9df4c69dcb37a912dbb6fb1edee9d240af5f17a57b5a6d6fc47d0151a3d3 SHA512 a802c27c2d24ca5af622e3fd77e46ceaf74f45e09a5aba54a0f31f3860c36ce31bef4034151c3c1b0671c9113840fb8c8b8fbfeb74716c6ed1708e5c7ee3c229
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST gcsfuse-0.32.0.tar.gz 3887440 BLAKE2B 2bf45226acacafc5ae0c0b595aa0d89909eda98d31c0d4a666f23fc6941fbbbe2d02f212d15c636ba30e3790512184d73bc7f78f9fdbaa1af83c4f2fcbfb7bf5 SHA512 a78665631c8a7491ebf0abfcbc4c1c62d41515746ceead0cd878ea84fef807ec95198dc04ea301fccedb7be089d47468bba7c873eb83f302133717f03e6b1087
+DIST gcsfuse-0.33.0.tar.gz 3887109 BLAKE2B 581363353dbadb910c5a9c57b06d741cc26c071e7cb050433ca7d77d8cf287f07381444f85e8bbe5c0bfa9996361ffabd15fb011809936ab0f738b5b96f051fd SHA512 25d554262c1c2d966f7b125b025f602acf2ce5f073cb3a029a01c905f88cd1f6058936a99086239f368bafc0c8eb72d9f06f4d4f1031d8b24c3ce3877e60f8fd
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
--- a/sys-fs/gcsfuse/gcsfuse-0.33.0.ebuild
+++ b/sys-fs/gcsfuse/gcsfuse-0.33.0.ebuild
@@ -431,7 +431,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"

 src_compile() {
-	go build -v -x -work -o "${PN}" || die "build failed"
+	go build -ldflags "-X main.gcsfuseVersion=${PV}" -v -x -work -o "${PN}" || die "build failed"
 }

 src_install() {
--- a/x11-themes/obsidian2-gtk-theme/Manifest
+++ b/x11-themes/obsidian2-gtk-theme/Manifest
@@ -1 +1 @@
-DIST obsidian2-gtk-theme-2.17.tar.gz 958471 BLAKE2B 7eb39a6ad371a43d0a6693724626d6ffb8e00bda04d5490f59d5f8d7822b08d486295558454021e51157f0fc381ac8691adbc5b6138c511bebcec78141c99830 SHA512 266e7974622b5fcbd56791649279e369efb78798b16562eb4aa4b0f8d647ccd9497189effc457b9d008408a34f8f40a7ff47dab81c4df286064ac39f9438a548
+DIST obsidian2-gtk-theme-2.18.tar.gz 915168 BLAKE2B d139d9ee3d203d57dcedfedb1adc5091c59c33564503e5cc3aebef9fd66ca51f6ea13d63c2f591e6db737184e76b9e3661f3c14b276d230fb5026923657e02cd SHA512 d05cd86a881515d01ac4a11851fdab982d5f7970493da4f673a8f8851a0d673c763936b7dc008eddbde104cf9e11e1630ae09315c4daba257c85057ca8f84985
--- a/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-2.18.ebuild
+++ b/x11-themes/obsidian2-gtk-theme/obsidian2-gtk-theme-2.18.ebuild
				`@@ -0,0 +1 @@`
				`DIST kcgi-0.12.2.tgz 243979 BLAKE2B a142cf80ffc18677b245172d9af63104816eb12e377b99593186c7b8855459513c87c43eaa0ec38328684f17d22fae2b19c28bd30b5f4983ac538d43c7aabf52 SHA512 f28dd2134936036c44bbd3fc094e512c52019e0dc39f085a396924331c0e7f0bb940cee8afae43147674065b7d5a1d057c56cfdb0040131b72da53dff2289d31`
				`@@ -0,0 +1 @@`
				`DIST tootle-1.0_alpha2.tar.gz 794059 BLAKE2B 7dd03b8bdb3f8b9ae3758fc8c3e7f1fa3529ddc61cf3e281ed92330b89c99651e860d213cf1a3818abff24853b20a9562f46ac1c601e94537bf45940166a17aa SHA512 cb51fce1b439a0703be5e0c755aaebd4ad81b87252f19784cbec80ce3c43e94bfc72c5e205e9a016706a8edd4dfffc9ce0ecfddae4fc45f0edec85f5fca9dfcf`