diff --git a/net-wireless/rtl8821ce/Manifest b/net-wireless/rtl8821ce/Manifest
index 456f6e0e9..c324f4c20 100644
--- a/net-wireless/rtl8821ce/Manifest
+++ b/net-wireless/rtl8821ce/Manifest
@@ -1,3 +1,3 @@
-DIST rtl8821ce-20210321.zip 5011263 BLAKE2B eaf20dd75a57ad5ea15237a6b762edae90d1a327c080e7e8ff2cd9f004aefb14b5e31611d0103c8d5e5b33d6056b157d3c2b4b513580663883b09cf32d669163 SHA512 1d37e67b6c96db947f8aed3c87b1fa08502e38b858e8472f9c565a7b913c1598cfbfd0402f200387a9ee663ba7b4264d4a5a6dd86fff931f2f0617d8ee7cef0e
DIST rtl8821ce-20211119.zip 5011475 BLAKE2B 7584fa0c2f8e8872364d96650785f2b9061e2828dffc60195f5f8ed6abd74b5337368d23da78b0adfef029a489749696c924ff555ee7ceb51b32f6b76666e17e SHA512 7059d4fe211d7a74935a0292b34e262566bbdeb6c09cbec8d5a50abded55ba083f881ca4c4f2c54b3a12ebe936628b69a2baeff8e01e2b7878ab714c1e0dfe52
DIST rtl8821ce-20230101.zip 5012454 BLAKE2B 06c10e676dfc8c35c36d5d607beb5c28df5cabf60f96fd6be137c9979eab8e9aac6432522c2e97595eb60bbcce7893fbaf13b372574b5b1ea5555b716a161d8e SHA512 8904d0d331d83b280f32c26e6d1f1bccf38d9933d58f9c9c7ee2d1b67e2e5a5c706b22cc224805f1572ccaa0dc8c7b650c77e710b51dc0a00596383b1356c413
+DIST rtl8821ce-20230504.tar.gz 4523223 BLAKE2B 93d9009bfac0bb3b5a1ffd98b31e77cc6c2d5725e4164addfe4090adc1887d760316264e73308145537e8819768b7630b24f9d988bdb84c2b3146d1484732925 SHA512 fcaaf26947f72cd57aa79092bd8c62ac60482cd1029c11ec16fcc0e56d2cc0578086449aab3cf12c5a128c13ffeb952d0f620d099d3d19f04d6a3ae7f0ff75ba
diff --git a/net-wireless/rtl8821ce/rtl8821ce-20210321.ebuild b/net-wireless/rtl8821ce/rtl8821ce-20230504.ebuild
similarity index 57%
rename from net-wireless/rtl8821ce/rtl8821ce-20210321.ebuild
rename to net-wireless/rtl8821ce/rtl8821ce-20230504.ebuild
index 540321cae..481672489 100644
--- a/net-wireless/rtl8821ce/rtl8821ce-20210321.ebuild
+++ b/net-wireless/rtl8821ce/rtl8821ce-20230504.ebuild
@@ -1,41 +1,29 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit linux-mod
-COMMIT="897e7c4c15dd5a0a569745dc223d969a26ff5bfc"
+COMMIT="a478095a45d8aa957b45be4f9173c414efcacc6f"
DESCRIPTION="Realtek RTL8821CE Driver module for Linux kernel"
HOMEPAGE="https://github.com/tomaspinho/rtl8821ce"
-SRC_URI="https://codeload.github.com/tomaspinho/rtl8821ce/zip/${COMMIT} -> rtl8821ce-${PV}.zip"
+SRC_URI="https://github.com/tomaspinho/rtl8821ce/archive/${COMMIT}.tar.gz -> rtl8821ce-${PV}.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64"
-DEPEND="virtual/linux-sources
- app-arch/unzip"
-RDEPEND=""
+DEPEND="virtual/linux-sources"
S="${WORKDIR}/rtl8821ce-${COMMIT}"
MODULE_NAMES="8821ce(net/wireless)"
BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
+CONFIG_CHECK="~!RTW88_8821CE"
+ERROR_RTL8XXXU="The RTW88_8821CE module is enabled in the kernel; it conflicts with this module."
pkg_setup() {
linux-mod_pkg_setup
BUILD_PARAMS="KERN_DIR=${KV_DIR} KSRC=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
}
-
-src_compile(){
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-}
diff --git a/sys-apps/calculate-access/metadata.xml b/sys-apps/calculate-access/metadata.xml
index ee8676aae..515a509b8 100644
--- a/sys-apps/calculate-access/metadata.xml
+++ b/sys-apps/calculate-access/metadata.xml
@@ -6,4 +6,8 @@
Mir Calculate
Calculate Overlay
+
diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest
index 61c6fd012..9708f5778 100644
--- a/sys-apps/calculate-utils/Manifest
+++ b/sys-apps/calculate-utils/Manifest
@@ -20,5 +20,6 @@ DIST calculate-lib-3.7.3.10.tar.bz2 1224832 BLAKE2B 52dd07c044f954dbf4b85ce89027
DIST calculate-lib-3.7.3.17.tar.bz2 1224983 BLAKE2B 2ba63169e298d1b98a47feb083afe3c995ef247307200580bb5170b56ae334bc1225e7819ef66316181a1adf3c8e06e486b20091e515d4a9fba1e0d1faa9b4b8 SHA512 d301b2d8536c956b7053af0a6aba01dd8bed1effdc22c6ac7df142e55edb0ba8595d474fa21d98e5bcae904fb3b4c2aa2ae15f421344c92f7cc7959d6b00d261
DIST calculate-lib-3.7.3.18.tar.bz2 1225609 BLAKE2B 8a33a451f3f681d86c68396cc9c19d4c6d9d292566009f5e0102ed477a59f9c198573386f08c6754d85e1568eed1cc610c6b9b8538c51157a3dfc9769a4f2765 SHA512 ea52aeb2aecca25adebe1ec09665a0f71e4081a0aafe8498faafccd3fa23ab047190881ce8cd02b0839e30117f4dd4e122f7e76ef21c95a753c0120e197cbf29
DIST calculate-lib-3.7.3.19.tar.bz2 1225213 BLAKE2B 9fad57a286ed51469bc4a37bceb936b0bab7d57650ff258f84d181222e38b4c9b45cb696bfbaf26d45561259df8485aa5ba992de4fdcea8f5dc8d2dcdda8ce16 SHA512 595937c0b460ce404b72eb339f1b5f5fc6162899a797b78b537cdbb1e7e193360df22311a15462586c1ef1aee70074c01b3a1538c7aa79ca377d9da70b6697ed
+DIST calculate-lib-3.7.3.20.tar.bz2 1225522 BLAKE2B 9f560f908934e8167ff6377b16c611b9e79999e55d5c230acc95cd8f9b4d8fe79a33f55959311eebeb89576f750930a546192a602d80e0dcbd2669f746540aa8 SHA512 ba5fdc3f4a071aaba1ca9cf9fcca6ae6c51fab1b05859c7e64c3bc0175099a712c15947f1a8ddb6e7b13e2028ae58cd009145eb7e182edd8cbb28a1cd9572060
DIST calculate-update-3.7.3.5.tar.bz2 43403 BLAKE2B 9b0aea2afc86bac065244e7838e6c3398a0d035dc12ebe17171d9d21d71d9c24871c5f7d43d550f4da14f1097d88069be6c5f691d0ffb6131a320e253d949440 SHA512 f0ce148131acdd474815f08dee253e8a86785012c4e0c40a03f693be0971b75c88e5b7c299e91e8344ebe6e7446a9486a0634e96b6d0c7b48ce1bb0ce0d02196
DIST calculate-update-3.7.3.8.tar.bz2 43456 BLAKE2B 93b9358aae807b15ca368edf2f6aa9e39d0ba592a8d5801e3e171c59b311f69db080dac451c7f2b238155cde776d3ec6f2a364744a94b9a9e4daca29f83904b9 SHA512 30856fa79f61a379180d436d98c186b1a56638cf8e62740a613625d2a993df92a869545a81e7c8f13ff5744b3368f27de0fccb3089199b04a9a6b68ecc78db3f
diff --git a/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r2.ebuild b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r2.ebuild
new file mode 100644
index 000000000..1a4944a08
--- /dev/null
+++ b/sys-apps/calculate-utils/calculate-utils-3.7.4.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="7"
+
+UTILS_PV="3.7.3"
+
+declare -A CALCULATE_MODULES=(
+ ["lib"]="3.7.3.20"
+ ["install"]="3.7.3.8"
+ ["core"]="3.7.3.1"
+ ["i18n"]="3.7.3.5"
+ ["client"]="3.7.3.4"
+ ["console"]="3.7.3"
+ ["console-gui"]="3.7.3.1"
+ ["update"]="3.7.3.8"
+ ["builder"]="3.7.3.7"
+)
+
+inherit calculate-utils-r16
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64"
+