cutefishos DE: Bump to v0.8

cutefish-base/cutefish-appmotor/Manifest

@@ -0,0 +1 @@
+DIST cutefish-appmotor-0.8.tar.gz 125163 BLAKE2B 88644d46e7cf947e2ffc8a3d421091d3be86da389e196b03b41afc70f44d012bf4875e4d7de598e41a5fafd22cf63f89165ebf6aa603347ad32d083f9f8e3b60 SHA512 4c79661efbec2211dfe9007be4cb996bfe34ed6bfdfdcefe24f4c30eea1716b41b6e17fa872a4315f0a907c50e4895ad0559a43e238fa0f5b5ac96dd2974e235

cutefish-base/cutefish-appmotor/cutefish-appmotor-0.8.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/appmotor.git"
+	EGIT_CHECKOUT_DIR=cutefish-appmotor-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="c332dbac831ba3050513bd340ec25ab84f781750"
+	SRC_URI="https://github.com/cutefishos/appmotor/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/appmotor-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Optimize the speed of starting cutefish apps"
+HOMEPAGE="https://github.com/cutefishos/appmotor"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	kde-frameworks/extra-cmake-modules
+	dev-libs/glib
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdeclarative
+	dev-qt/qtquickcontrols2
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-appmotor/cutefish-appmotor-9999.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/appmotor.git"
+	EGIT_CHECKOUT_DIR=cutefish-appmotor-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="c332dbac831ba3050513bd340ec25ab84f781750"
+	SRC_URI="https://github.com/cutefishos/appmotor/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/appmotor-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Optimize the speed of starting cutefish apps"
+HOMEPAGE="https://github.com/cutefishos/appmotor"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	kde-frameworks/extra-cmake-modules
+	dev-libs/glib
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdeclarative
+	dev-qt/qtquickcontrols2
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-appmotor/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<bugs-to>https://github.com/cutefishos/appmotor/issues</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>hougelangley1987@gmail.com</email>
+		<name>苏业钦</name>
+	</maintainer>
+</pkgmetadata>

cutefish-base/cutefish-calculator/cutefish-calculator-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,18 +22,18 @@ HOMEPAGE="https://github.com/cutefishos/calculator"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
 "
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/linguist-tools
+"
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-calculator/cutefish-calculator-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,18 +22,18 @@ HOMEPAGE="https://github.com/cutefishos/calculator"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
 "
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/linguist-tools
+"
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-dock/Manifest

@@ -1 +1,2 @@
-DIST cutefish-dock-0.7.tar.gz 48689 BLAKE2B a774c7132b7fb784597d43449a9f08455b95cc7ced92b8f8a8325a9ade4b8fe8aa0386a6a8c3338a37cead25c12de88fe62146c98503724882e55b6a8ad123f7 SHA512 b488cfdddcb5603db033084f44c0700a383c5c76d1c964602d013eda0a1d85e32397e0d49a883b84bbb46b48142e89a854902ddbad04b79fdf740ee924ca1adb
+DIST cutefish-dock-0.7.tar.gz 49484 BLAKE2B ab9d73c9d74aab0e359fe612ddfa9ed5c1e3c45fe814e97657908b892a24d238c57b034ff492bfcad2de8aacdb598f5bedfa782e4be11166b982e5165eec87b3 SHA512 be4208ad919e0e04fae0314ff008ab1c10dcb6ce7b76afee1d5fe1c738431c34d24ef927c784a9157f080ca73497e4606fa3da6d3e0918fcedddead899147254
+DIST cutefish-dock-0.8.tar.gz 49441 BLAKE2B 0852865f4132d190ae11a87e7bf0295c08e259a2d170a7129cac8329e9ebce2bcb76d35f70d66bad12c3163320c83af7c2b3b5300db5f9adadda89f28e28eb00 SHA512 98d97abcbc82afd31e13fff3f76bc81f12ba2ab2c1fdcec3c0c800d1945d9353bb7d7086d3d79ae0edc397db025a76afcd7e09e2e68ab60f07770bd3931515d7

cutefish-base/cutefish-dock/cutefish-dock-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-dock-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="ecd8ce48b635e14349fdf1bfa3afcd64510249eb"
+	EGIT_COMMIT="eec8dd984be3ddddae1a674580bafbf0998df7e4"
 	SRC_URI="https://github.com/cutefishos/dock/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/dock-${EGIT_COMMIT}"
@@ -23,19 +23,22 @@ HOMEPAGE="https://github.com/cutefishos/dock"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
-	dev-qt/qtsvg
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
+	dev-qt/qtquickcontrols2
+	kde-frameworks/kwindowsystem
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-dock/cutefish-dock-0.8.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/dock.git"
+	EGIT_CHECKOUT_DIR=cutefish-dock-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/dock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/dock-${PV}"
+fi
+
+DESCRIPTION="CutefishOS application dock"
+HOMEPAGE="https://github.com/cutefishos/dock"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
+	dev-qt/qtquickcontrols2
+	kde-frameworks/kwindowsystem
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-dock/cutefish-dock-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-dock-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="ecd8ce48b635e14349fdf1bfa3afcd64510249eb"
+	SRC_URI="https://github.com/cutefishos/dock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/dock/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/dock-${EGIT_COMMIT}"
+	S="${WORKDIR}/dock-${PV}"
 fi
 
 DESCRIPTION="CutefishOS application dock"
@@ -23,19 +22,22 @@ HOMEPAGE="https://github.com/cutefishos/dock"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
-	dev-qt/qtsvg
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
+	dev-qt/qtquickcontrols2
+	kde-frameworks/kwindowsystem
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-filemanager/Manifest

@@ -1 +1,2 @@
-DIST cutefish-filemanager-0.7.tar.gz 198509 BLAKE2B 3c984a08d5320326c1d17f9ee81fe4011daf5814c7d7bb6028d705f2d22c40525a06f5b4e825860b9ec48943095bc8c0f29050ebb939ef22b1052f48fb285701 SHA512 e4c958595fe360aaae582797216f406e8831a3452ecba8717a8420f5c198c9647db805c8b75e5671b5bd46dc703ed3bc337c621ef9f3733d299778862d46dd4e
+DIST cutefish-filemanager-0.7.tar.gz 204796 BLAKE2B b32ebe90e5aef506e25293270549ceec27815c7b7bf3a6f3d956d4debfebccfdd67796761e5320e909d835a69b90f1d92acf16d53a9c758ca058904b4c059c04 SHA512 8453f960ecc33fe3705efd0250e208afaf295a79ae465bc781918aaec2d8b0e224bfda4f3132d4abebb188b6e42d003ae17c68b9b5ef730c885fa8cbe9ba12f1
+DIST cutefish-filemanager-0.8.tar.gz 205962 BLAKE2B 701c1d5289bef22e25ef3c059d4d0f861586b314c60a0805d1e5a6d459fb6d648eed466aae7dcad6e6c410e2ee1f01241eacd9c106bfcf0e9d21e25e267c4883 SHA512 af3f1caa982c19e14357346d6227034086020977f21b4f06af500d5d92845d142ee530fb151649fd2e7dadbd1837eb13c400968a3b407412baed7044fb60101d

cutefish-base/cutefish-filemanager/cutefish-filemanager-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-filemanager-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="94ecc5661736bf50440c150e06cb3266ddb10f48"
+	EGIT_COMMIT="9c5b3bc3cd8ccd57c3669adb81259ca85c99a901"
 	SRC_URI="https://github.com/cutefishos/filemanager/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/filemanager-${EGIT_COMMIT}"
@@ -23,20 +23,20 @@ HOMEPAGE="https://github.com/cutefishos/filemanager"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore[icu]
+	dev-qt/qtdbus
+	dev-qt/qtdeclarative
+	dev-qt/linguist-tools
 	kde-frameworks/kio
 	kde-frameworks/solid
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-filemanager/cutefish-filemanager-0.8.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/filemanager.git"
+	EGIT_CHECKOUT_DIR=cutefish-filemanager-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/filemanager/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/filemanager-${PV}"
+fi
+
+DESCRIPTION="Cutefish File Manager"
+HOMEPAGE="https://github.com/cutefishos/filemanager"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore[icu]
+	dev-qt/qtdbus
+	dev-qt/qtdeclarative
+	dev-qt/linguist-tools
+	kde-frameworks/kio
+	kde-frameworks/solid
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-filemanager/cutefish-filemanager-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-filemanager-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="94ecc5661736bf50440c150e06cb3266ddb10f48"
+	SRC_URI="https://github.com/cutefishos/filemanager/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/filemanager/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/filemanager-${EGIT_COMMIT}"
+	S="${WORKDIR}/filemanager-${PV}"
 fi
 
 DESCRIPTION="Cutefish File Manager"
@@ -23,20 +22,20 @@ HOMEPAGE="https://github.com/cutefishos/filemanager"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore[icu]
+	dev-qt/qtdbus
+	dev-qt/qtdeclarative
+	dev-qt/linguist-tools
 	kde-frameworks/kio
 	kde-frameworks/solid
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-gtk-themes/Manifest

@@ -0,0 +1 @@
+DIST cutefish-gtk-themes-0.7.tar.gz 436606 BLAKE2B b06e5ead7be289196dced6a98d5624c94e4cab26a03b9d22f0d584022258772fd22f5ac441ae2e9523f40b3a069cfd536589b0e4d0ad70a6e0433ec8013ed8eb SHA512 dfdaf6884672bc7223bb5826432e164bdaa2df8d31f053054d19704f8e996f923d89e0182f26285cc579e2d353ff162c8bfed4ba73b7e23ae5a19d81bd748836

cutefish-base/cutefish-gtk-themes/cutefish-gtk-themes-0.7.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/gtk-themes.git"
+	EGIT_CHECKOUT_DIR=cutefish-gtk-themes-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/gtk-themes/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/gtk-themes-${PV}"
+fi
+
+DESCRIPTION="CutefishOS GTK Themes"
+HOMEPAGE="https://github.com/cutefishos/gtk-themes"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-gtk-themes/cutefish-gtk-themes-9999.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/gtk-themes.git"
+	EGIT_CHECKOUT_DIR=cutefish-gtk-themes-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="91f762fc2b069c4754d7e5741e07613bfea049a4"
+	SRC_URI="https://github.com/cutefishos/gtk-themes/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/gtk-themes-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="CutefishOS GTK Themes"
+HOMEPAGE="https://github.com/cutefishos/gtk-themes"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-gtk-themes/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<bugs-to>https://github.com/cutefishos/gtk-themes/issues</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>hougelangley1987@gmail.com</email>
+		<name>苏业钦</name>
+	</maintainer>
+</pkgmetadata>

cutefish-base/cutefish-icons/Manifest

@@ -1 +1,2 @@
-DIST cutefish-icons-0.7.tar.gz 5335420 BLAKE2B 9a1bacff377eb486546237e0db430d5136ab34c8f82bf261294d72a58a6e50771e184ae3accf7fb77f692634ba26eba5639bacfabbf1ef1cbc5a767ea4e565fc SHA512 28b121214da1831f21a3818e276f6ab12845b8386923b71ce8ea226d0016c3a61fa5b6090619acb7cc53b65c0b08c87f4411ef65a0effe462db2863b31c85219
+DIST cutefish-icons-0.7.tar.gz 5256708 BLAKE2B 21bad5bf3cdacf78cfa39181a463701530923e9f57e94f799db7acbe41f95356fd1874e4363998f0b01f69e39937fe499609c5398561cd8f2fbd7cc32a1a58dd SHA512 d36e5aaf078466ad525f0736813d9f49ba5be3c92c5083b85e8ad5916a97129fa2e886cca3172329afeb078108daa938ac3e406164fe56fe2da952564dde5340
+DIST cutefish-icons-0.8.tar.gz 5258559 BLAKE2B eda70fb714b74864d1405ea44277625fa8bfb4a6823d62fc9d081ca66cb75d559c7900281d6e936014fc349e401299a805850ffa885f71077e89c4e5faedd072 SHA512 064f81cf8f9ac6d3fdf3eff4500df0c349335432c49fd2d7a01cc84060b97372c2ea92998670cf68e0f1e8f099aedb9164a285af4f74da47bb750754649df464

cutefish-base/cutefish-icons/cutefish-icons-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-icons-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="119feb59404f329eb2f1ebe14d63f3d53f8bd96c"
+	EGIT_COMMIT="aa0422ffbd201ee7da3670b27eccc11b6c799d62"
 	SRC_URI="https://github.com/cutefishos/icons/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/icons-${EGIT_COMMIT}"
@@ -25,7 +25,6 @@ IUSE=""
 RDEPEND=""
 DEPEND=""
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
 "
 

cutefish-base/cutefish-icons/cutefish-icons-0.8.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/icons.git"
+	EGIT_CHECKOUT_DIR=cutefish-icons-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/icons/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/icons-${PV}"
+fi
+
+DESCRIPTION="System default icon theme of CutefishOS"
+HOMEPAGE="https://github.com/cutefishos/icons"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-icons/cutefish-icons-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-icons-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="119feb59404f329eb2f1ebe14d63f3d53f8bd96c"
+	SRC_URI="https://github.com/cutefishos/icons/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/icons/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/icons-${EGIT_COMMIT}"
+	S="${WORKDIR}/icons-${PV}"
 fi
 
 DESCRIPTION="System default icon theme of CutefishOS"
@@ -25,7 +24,6 @@ IUSE=""
 RDEPEND=""
 DEPEND=""
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
 "
 

cutefish-base/cutefish-kwin-plugins/Manifest

@@ -1 +1,2 @@
 DIST cutefish-kwin-plugins-0.7.tar.gz 34116 BLAKE2B b4246f33f40e293969cd91de0c19a35a44fe7254b46e5d538303f0f7c2795f91c3fd0b3eb4d623b7d0425d7a1a7c232b63adbcee939ddcb7bbcf149f994e8c0b SHA512 e5ef90a20a391b455a5df5f531bfb0b1c130034530db4c4491b21f95713b8bb09f82bc25493add839812cfea6fbb7fc567448d81f5dffef34eaa38abf581637e
+DIST cutefish-kwin-plugins-0.8.tar.gz 34146 BLAKE2B 34c8201705e607434aa1658f690417eef535269dac58e01cc7b72815c44056eb0d893b547ef86ad6ab0b78b2ec82906b4db13c2ad029ed2642803d3b4643497e SHA512 592e1be40bcd1052ff70293b00667604c23f3201ab1888f3e77b2b01199cd06edda4eec2a88534b2814d80deedd23f29c96d7700a14db2fde6902023e5bf8b79

cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,24 +24,15 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kwindowsystem
 	kde-frameworks/kconfig
 	kde-plasma/kdecoration
-	kde-frameworks/kguiaddons
-	kde-frameworks/kcoreaddons
-	kde-frameworks/kconfigwidgets
-	kde-frameworks/kwindowsystem
-	kde-frameworks/kwayland
 	kde-plasma/kwin
 "
-BDEPEND="${DEPEND}
+BDEPEND="${DEPEND}"
-	kde-frameworks/extra-cmake-modules
-	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
-	dev-qt/qtopengl
-"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-0.8.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/kwin-plugins.git"
+	EGIT_CHECKOUT_DIR=cutefish-kwin-plugins-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/kwin-plugins/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/kwin-plugins-${PV}"
+fi
+
+DESCRIPTION="CutefishOS KWin Plugins"
+HOMEPAGE="https://github.com/cutefishos/kwin-plugins"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kwindowsystem
+	kde-frameworks/kconfig
+	kde-plasma/kdecoration
+	kde-plasma/kwin
+"
+BDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-kwin-plugins-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="b5198d15880b8df7ffd7f83100cb90d9bbbe9c79"
+	SRC_URI="https://github.com/cutefishos/kwin-plugins/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/kwin-plugins/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/kwin-plugins-${EGIT_COMMIT}"
+	S="${WORKDIR}/kwin-plugins-${PV}"
 fi
 
 DESCRIPTION="CutefishOS KWin Plugins"
@@ -24,24 +23,15 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kwindowsystem
 	kde-frameworks/kconfig
 	kde-plasma/kdecoration
-	kde-frameworks/kguiaddons
-	kde-frameworks/kcoreaddons
-	kde-frameworks/kconfigwidgets
-	kde-frameworks/kwindowsystem
-	kde-frameworks/kwayland
 	kde-plasma/kwin
 "
-BDEPEND="${DEPEND}
+BDEPEND="${DEPEND}"
-	kde-frameworks/extra-cmake-modules
-	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
-	dev-qt/qtopengl
-"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-launcher/Manifest

@@ -1 +1,2 @@
-DIST cutefish-launcher-0.7.tar.gz 41207 BLAKE2B 17d48ad2373b50fad2dafc13d4731bd82029584d2aab74f35f33e9be9cf095b5701fe14e6deb2972cc9f9a98ef3f68198ffa3a4c9753fb325a01ca23000f5592 SHA512 ea9ae132d224f28b3e2c29bd524e3e58a6afca548a2830fbbdf6941cf1820efd9a1b390cac025ac4ef9a5889c149300681bf9aa5ec6d1e165e8ec52c299e522f
+DIST cutefish-launcher-0.7.tar.gz 41341 BLAKE2B de9a051a50172ed6265ea9d76570527bb8fc16f353feff47e6b41e34e5c075d2bfa0c593a8804ec36e0ce6f12a34daacb1fcd9544fdbfa731ec7df17fd90b432 SHA512 530516bb89a584f0973cfd45e58820be2b599c32822e5a5585cd5ff5a046337cb33cedac593a5c6c60fecafb99710d7ed412986198e38ce73b145c3366dd58f2
+DIST cutefish-launcher-0.8.tar.gz 41294 BLAKE2B e9b6cdf6bb509169cd6be7d1e269d5d5d205fd60df739263a38d3fcfc779c9b30c811db75b8f90ee431fbce09471def7c34ff8cf4cf0760dd91bcb4b55839fc6 SHA512 c439e259bb7e82ba2dacac55f792a3d78db6c4c2c194d01a1ac0dc36ff73c632dce1accd4617bd6e693bea828951dc6a4afdb6e9ad098eced7defcae7447833b

cutefish-base/cutefish-launcher/cutefish-launcher-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-launcher-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="c12a23f0a5553138fddae8f8bcd9b1aa8c07df5b"
+	EGIT_COMMIT="269441c6194671e5ef7605d63706ad9b17dfa642"
 	SRC_URI="https://github.com/cutefishos/launcher/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/launcher-${EGIT_COMMIT}"
@@ -23,19 +23,21 @@ HOMEPAGE="https://github.com/cutefishos/launcher"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtquickcontrols2
+	dev-qt/linguist-tools
+	dev-qt/qtconcurrent
 	kde-frameworks/kwindowsystem
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-launcher/cutefish-launcher-0.8.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/launcher.git"
+	EGIT_CHECKOUT_DIR=cutefish-launcher-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/launcher/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/launcher-${PV}"
+fi
+
+DESCRIPTION="CutefishOS's full-screen application launcher"
+HOMEPAGE="https://github.com/cutefishos/launcher"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtquickcontrols2
+	dev-qt/linguist-tools
+	dev-qt/qtconcurrent
+	kde-frameworks/kwindowsystem
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-launcher/cutefish-launcher-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-launcher-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="c12a23f0a5553138fddae8f8bcd9b1aa8c07df5b"
+	SRC_URI="https://github.com/cutefishos/launcher/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/launcher/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/launcher-${EGIT_COMMIT}"
+	S="${WORKDIR}/launcher-${PV}"
 fi
 
 DESCRIPTION="CutefishOS's full-screen application launcher"
@@ -23,19 +22,21 @@ HOMEPAGE="https://github.com/cutefishos/launcher"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtquickcontrols2
+	dev-qt/linguist-tools
+	dev-qt/qtconcurrent
 	kde-frameworks/kwindowsystem
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-meta/cutefish-meta-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,24 +10,28 @@ SRC_URI=""
 LICENSE="metapackage"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="+base +terminal +extra"
+IUSE="+base +terminal +extra +themes +sddm +cjk"
 
 RDEPEND="
-		>=sys-libs/cutefish-core-${PV}:${SLOT}
+		<=sys-libs/cutefish-core-0.8:${SLOT}
-		>=cutefish-base/cutefish-kwin-plugins-${PV}:${SLOT}
+		<=cutefish-base/cutefish-kwin-plugins-0.8:${SLOT}
-		>=cutefish-base/cutefish-icons-${PV}:${SLOT}
+		<=cutefish-base/cutefish-icons-0.8:${SLOT}
-		>=cutefish-base/cutefish-filemanager-${PV}:${SLOT}
+		<=cutefish-base/cutefish-filemanager-0.8:${SLOT}
-		>=cutefish-base/cutefish-calculator-${PV}:${SLOT}
+		<=cutefish-base/cutefish-calculator-0.8:${SLOT}
-		>=cutefish-base/cutefish-launcher-${PV}:${SLOT}
+		<=cutefish-base/cutefish-launcher-0.8:${SLOT}
-		>=cutefish-base/cutefish-qt-plugins-${PV}:${SLOT}
+		<=cutefish-base/cutefish-qt-plugins-0.8:${SLOT}
-		>=cutefish-base/cutefish-settings-${PV}:${SLOT}
+		<=cutefish-base/cutefish-settings-0.8:${SLOT}
-		>=cutefish-base/cutefish-statusbar-${PV}:${SLOT}
+		<=cutefish-base/cutefish-statusbar-0.8:${SLOT}
-		>=cutefish-base/cutefish-dock-${PV}:${SLOT}
+		<=cutefish-base/cutefish-dock-0.8:${SLOT}
-		>=cutefish-base/cutefish-wallpapers-${PV}:${SLOT}
+		<=cutefish-base/cutefish-wallpapers-0.8:${SLOT}
-		>=cutefish-base/cutefish-screenlocker-${PV}:${SLOT}
+		<=cutefish-base/cutefish-screenlocker-0.8:${SLOT}
-		>=cutefish-base/cutefish-screenshot-${PV}:${SLOT}
+		<=cutefish-base/cutefish-screenshot-0.8:${SLOT}
-		>=cutefish-base/cutefish-videoplayer-${PV}:${SLOT}
+		<=cutefish-base/cutefish-videoplayer-0.8:${SLOT}
 		x11-misc/sddm
-		terminal?	(	>=cutefish-base/cutefish-terminal-${PV}:${SLOT}	)
+		x11-misc/xdg-user-dirs
-		extra?	(	>=cutefish-base/cutefish-texteditor-${PV}:${SLOT}	)
+		terminal?	(	<=cutefish-base/cutefish-terminal-0.8:${SLOT}	)
+		extra?	(	<=cutefish-base/cutefish-texteditor-0.8:${SLOT}	)
+		themes?	(	<=cutefish-base/cutefish-gtk-themes-0.8:${SLOT}	)
+		sddm?	(	<=cutefish-base/cutefish-sddm-theme-0.8:${SLOT}	)
+		cjk?	(	media-fonts/noto[cjk]	)
 "

cutefish-base/cutefish-meta/cutefish-meta-0.8.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="CutefishOS Desktop Enviroment (meta package)"
+HOMEPAGE="https://cutefishos.com"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+base +terminal +extra +themes +sddm +cjk"
+
+RDEPEND="
+		>=sys-libs/cutefish-core-0.8:${SLOT}
+		>=cutefish-base/cutefish-appmotor-0.8:${SLOT}
+		>=cutefish-base/cutefish-kwin-plugins-0.8:${SLOT}
+		>=cutefish-base/cutefish-icons-0.8:${SLOT}
+		>=cutefish-base/cutefish-filemanager-0.8:${SLOT}
+		>=cutefish-base/cutefish-calculator-0.7:${SLOT}
+		>=cutefish-base/cutefish-launcher-0.8:${SLOT}
+		>=cutefish-base/cutefish-qt-plugins-0.8:${SLOT}
+		>=cutefish-base/cutefish-settings-0.8:${SLOT}
+		>=cutefish-base/cutefish-statusbar-0.8:${SLOT}
+		>=cutefish-base/cutefish-dock-0.8:${SLOT}
+		>=cutefish-base/cutefish-wallpapers-0.7:${SLOT}
+		>=cutefish-base/cutefish-screenlocker-0.8:${SLOT}
+		>=cutefish-base/cutefish-screenshot-0.8:${SLOT}
+		>=cutefish-base/cutefish-videoplayer-0.7:${SLOT}
+		x11-misc/sddm
+		x11-misc/xdg-user-dirs
+		terminal?	(	>=cutefish-base/cutefish-terminal-0.8:${SLOT}	)
+		extra?	(	>=cutefish-base/cutefish-texteditor-0.8:${SLOT}	)
+		themes?	(	>=cutefish-base/cutefish-gtk-themes-0.7:${SLOT}	)
+		sddm?	(	>=cutefish-base/cutefish-sddm-theme-0.8:${SLOT}	)
+		cjk?	(	media-fonts/noto[cjk]	)
+"

cutefish-base/cutefish-meta/metadata.xml

@@ -9,5 +9,8 @@
 		<flag name="base">Install Base CutefishOS</flag>
 		<flag name="terminal">Install CutefishOS Terminal Emulator</flag>
 		<flag name="extra">Install CutefishOS extra applicaions developed by CutefishOS ( Not Stable )</flag>
+		<flag name="themes">Install CutefishOS GTK Themes</flag>
+		<flag name="sddm">Install CutefishOS SDDM Themes</flag>
+		<flag name="cjk">Install Noto CJK By Default</flag>
 	</use>
 </pkgmetadata>

cutefish-base/cutefish-qt-plugins/Manifest

@@ -1 +1,2 @@
 DIST cutefish-qt-plugins-0.7.tar.gz 98746 BLAKE2B 130a9d0e10f1644323def3ef36878ba19bc54eec5870d5906f0a3788913d3b8c4235b3841f0d9e38f58e98be5793ff14005fbcaac7d8985438a12213a4310a42 SHA512 ea37bd24853ba6ee0397274094adce900eb8b178fb724042b2b88675857210b4a42d3e848a8191323c843ad1d278689ddac693f0bf38e2daf1a0f98d72468eef
+DIST cutefish-qt-plugins-0.8.tar.gz 98746 BLAKE2B 130a9d0e10f1644323def3ef36878ba19bc54eec5870d5906f0a3788913d3b8c4235b3841f0d9e38f58e98be5793ff14005fbcaac7d8985438a12213a4310a42 SHA512 ea37bd24853ba6ee0397274094adce900eb8b178fb724042b2b88675857210b4a42d3e848a8191323c843ad1d278689ddac693f0bf38e2daf1a0f98d72468eef

cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,18 +24,17 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
-	kde-frameworks/kwindowsystem
+	dev-qt/qtcore
-	dev-libs/libdbusmenu-qt
+	dev-qt/qtwidgets
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
 	dev-libs/libqtxdg
-	dev-qt/qtquickcontrols2[widgets]
+	dev-libs/libdbusmenu-qt
+	kde-frameworks/kwindowsystem
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-0.8.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/qt-plugins.git"
+	EGIT_CHECKOUT_DIR=cutefish-qt-plugins-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="b60cdd4c0cf185f538c9746ef321582cbab9568c"
+	SRC_URI="https://github.com/cutefishos/qt-plugins/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/qt-plugins-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Unify Qt application style of CutefishOS"
+HOMEPAGE="https://github.com/cutefishos/qt-plugins"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
+	dev-libs/libqtxdg
+	dev-libs/libdbusmenu-qt
+	kde-frameworks/kwindowsystem
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,18 +24,17 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
-	kde-frameworks/kwindowsystem
+	dev-qt/qtcore
-	dev-libs/libdbusmenu-qt
+	dev-qt/qtwidgets
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
 	dev-libs/libqtxdg
-	dev-qt/qtquickcontrols2[widgets]
+	dev-libs/libdbusmenu-qt
+	kde-frameworks/kwindowsystem
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-screenlocker/Manifest

@@ -1 +1,2 @@
-DIST cutefish-screenlocker-0.7.tar.gz 46998 BLAKE2B 81c7c70555aab8908941c04f887ce2ab2121ccb00dcd595f269bf9752f4e2301cccbb6f1aed92f231c60ccdd4cd823e5856e1c20fb28940cb488581d6aa6c028 SHA512 c94f227a2271d84141f012d1f2392d73a4080ec19ce2279b9187bbc5fe796b98c20ff52360693c6603d1b09420a60df79c34e7d0413aec7aa787ca18e423cacc
+DIST cutefish-screenlocker-0.7.tar.gz 47182 BLAKE2B 0fe8ad3f874b916b0a690ea151d898f449c83691138bceed2ac78d4c7eeaab55a95f0ccde0007fcb2328f0562555dac0e9675d0e3d13ef3e3b3025c331969bf1 SHA512 78695a75e1c77bf74abf3f70f8ed7b3912249fa195b48a9f71248e2bc240506f49f20aecc4a858dfe7d7bb724ed3971158b3af8f9ade331a0b33b0aa493b8dc1
+DIST cutefish-screenlocker-0.8.tar.gz 47612 BLAKE2B 334eceeb3ae72c13d4a906bc61c9301accb02953e081092ecd3b049ae6a7468748c39d9aeca78e805ee203bb908fccef6efc163b5e5adf6f287e8d455a7f6d58 SHA512 cfba4a8922058c2400be38e397d7f9f6461d898fddaf00547c978826edafb163ed56c95f0c58ead94590e822261e8a7d29562db0fe96acbd9af30ec6c83ccc5a

cutefish-base/cutefish-screenlocker/cutefish-screenlocker-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-screenlocker-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="90c70de51b61837dc9f52da58b5cce703cddab94"
+	EGIT_COMMIT="55fb5253deeeb5bcab54daed3ce75f64396debb8"
 	SRC_URI="https://github.com/cutefishos/screenlocker/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/screenlocker-${EGIT_COMMIT}"
@@ -23,18 +23,18 @@ HOMEPAGE="https://github.com/cutefishos/core"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtcore
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtdbus
-	dev-qt/assistant
+	dev-qt/qtwidgets
-	dev-qt/designer
+	dev-qt/qtx11extras
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-screenlocker/cutefish-screenlocker-0.8.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/screenlocker.git"
+	EGIT_CHECKOUT_DIR=cutefish-screenlocker-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="fe2dacebfc9993ee32fdcf0680c0919359b55316"
+	SRC_URI="https://github.com/cutefishos/screenlocker/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/screenlocker-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="CutefishOS system screen locker"
+HOMEPAGE="https://github.com/cutefishos/core"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtdbus
+	dev-qt/qtwidgets
+	dev-qt/qtx11extras
+	dev-qt/linguist-tools
+"
+BDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-screenlocker/cutefish-screenlocker-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-screenlocker-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="90c70de51b61837dc9f52da58b5cce703cddab94"
+	EGIT_COMMIT="fe2dacebfc9993ee32fdcf0680c0919359b55316"
 	SRC_URI="https://github.com/cutefishos/screenlocker/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/screenlocker-${EGIT_COMMIT}"
@@ -23,18 +23,18 @@ HOMEPAGE="https://github.com/cutefishos/core"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtcore
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtdbus
-	dev-qt/assistant
+	dev-qt/qtwidgets
-	dev-qt/designer
+	dev-qt/qtx11extras
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-screenshot/Manifest

@@ -1 +1,2 @@
-DIST cutefish-screenshot-0.7.tar.gz 21726 BLAKE2B 14920adeec314262d8776dc2bc541ab1ef7f26c5b500058a4e3360f41303c1ebe9ab173660041846f5f77e892324736346e51305a58020b828cb2969cfbb619c SHA512 c44bb93274feaf1a5a0ffcbb48884bd88bcaf80574ab6cf164f69970af66933f56983e3c6a64f3174ada08a057bf2f93551b0316bbd58f01fb32c4a6fd5b0882
+DIST cutefish-screenshot-0.7.tar.gz 22012 BLAKE2B fb416a312995a5f601d3b8fb2e6214f7132315b00e0f01bcac17e2684bd67e65fcd732fb9adfcceca5532379da6b798c91c9cbbf1b50ec4e6ab933af65fd8f37 SHA512 0c4c79ddd1386348c8653c7dcb478f7c00b7fc4b835350b3a9ab364633d219c92bdece742c23ec0664bc6fcfab9a256bc9fa389c6e0f49c3b1263b80a8838bc8
+DIST cutefish-screenshot-0.8.tar.gz 22318 BLAKE2B d525c3b65873407d7b6f9511fd15f85ba152a0a627f42d4f47abcee6eeb9a24d7c12689411a8b867d7670c912561f5b2397f93a95c1c9c1f950aeda1119e749a SHA512 e664f67987390b7be018102a552d66a87184aa7d8ceedde425e3f0beb7b952ce66d4b9fe10031816e0cf222d7755469bda78ecb112c68a74e719aef3f11f3050

cutefish-base/cutefish-screenshot/cutefish-screenshot-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-screenshot-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="1ab2dd3e6e94a7ec722afd02bc63beae9cb28b97"
+	EGIT_COMMIT="a7ec945228c609487873009586b577336b90abf5"
 	SRC_URI="https://github.com/cutefishos/screenshot/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/screenshot-${EGIT_COMMIT}"
@@ -24,14 +24,15 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 RDEPEND=""
-DEPEND=""
+DEPEND="
-BDEPEND="${DEPEND}
+	dev-qt/qtcore
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtdbus
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtgui
-	dev-qt/assistant
+	dev-qt/qtwidgets
-	dev-qt/designer
+	dev-qt/qtdeclarative
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-screenshot/cutefish-screenshot-0.8.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/screenshot.git"
+	EGIT_CHECKOUT_DIR=cutefish-screenshot-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/screenshot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/screenshot-${PV}"
+fi
+
+DESCRIPTION="Screenshot tool for CutefishOS"
+HOMEPAGE="https://github.com/cutefishos/screenshot"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtdbus
+	dev-qt/qtgui
+	dev-qt/qtwidgets
+	dev-qt/qtdeclarative
+	dev-qt/linguist-tools
+"
+BDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-screenshot/cutefish-screenshot-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ if [[ ${PV} = 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-screenshot-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="1ab2dd3e6e94a7ec722afd02bc63beae9cb28b97"
+	SRC_URI="https://github.com/cutefishos/screenshot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/screenshot/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/screenshot-${EGIT_COMMIT}"
+	S="${WORKDIR}/screenshot-${PV}"
 fi
 
 DESCRIPTION="Screenshot tool for CutefishOS"
@@ -24,14 +23,15 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 RDEPEND=""
-DEPEND=""
+DEPEND="
-BDEPEND="${DEPEND}
+	dev-qt/qtcore
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtdbus
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtgui
-	dev-qt/assistant
+	dev-qt/qtwidgets
-	dev-qt/designer
+	dev-qt/qtdeclarative
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-sddm-theme/Manifest

@@ -0,0 +1,2 @@
+DIST cutefish-sddm-theme-0.7.tar.gz 402774 BLAKE2B 9a88d84eccdc9cade15aad2683144788e5852b46152c83bda59b41030e88af1d95e2ca4037418f6fc1bd1958d0d9e4aab04476b9b2435e88300988a8e86aee07 SHA512 b74abbb8079e303db89fc4f4e7294c2f1560e0ddc88d8bea30d118c356ecf6ffe9d0f4c3a35e133b8063bb78377de27970bf6f8d143ab17ed1d52d093d9809d3
+DIST cutefish-sddm-theme-0.8.tar.gz 402876 BLAKE2B 1cc9cbeb53805e7452f07b560f322837ff850aaafad56f847d9072a5534b49cac3d347875413694dce992db3247ceb9558fec50c5acf140f235a30bfd50decb0 SHA512 1ecdc4265d1b181d4d307aeb2a2727d18ed1152b6edd3c3d2e72798ccf6498eee3a1b483993ab3f8c21ba63b1c5e8f1cb8f1caf6eca41e82454da1bddccaa416

cutefish-base/cutefish-sddm-theme/cutefish-sddm-theme-0.7.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/sddm-theme.git"
+	EGIT_CHECKOUT_DIR=cutefish-sddm-theme-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="d3722b62c5b87b8bb88a7e2d75dbdefaadc7d1a2"
+	SRC_URI="https://github.com/cutefishos/sddm-theme/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/sddm-theme-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="CutefishOS SDDM Theme"
+HOMEPAGE="https://github.com/cutefishos/sddm-theme"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-sddm-theme/cutefish-sddm-theme-0.8.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/sddm-theme.git"
+	EGIT_CHECKOUT_DIR=cutefish-sddm-theme-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="7da9648764bb8113a6a9b07b3ca48799861b4451"
+	SRC_URI="https://github.com/cutefishos/sddm-theme/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/sddm-theme-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="CutefishOS SDDM Theme"
+HOMEPAGE="https://github.com/cutefishos/sddm-theme"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-sddm-theme/cutefish-sddm-theme-9999.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/sddm-theme.git"
+	EGIT_CHECKOUT_DIR=cutefish-sddm-theme-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="7da9648764bb8113a6a9b07b3ca48799861b4451"
+	SRC_URI="https://github.com/cutefishos/sddm-theme/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/sddm-theme-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="CutefishOS SDDM Theme"
+HOMEPAGE="https://github.com/cutefishos/sddm-theme"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-sddm-theme/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<bugs-to>https://github.com/cutefishos/sddm-theme/issues</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>hougelangley1987@gmail.com</email>
+		<name>苏业钦</name>
+	</maintainer>
+</pkgmetadata>

cutefish-base/cutefish-settings/Manifest

@@ -1 +1,2 @@
-DIST cutefish-settings-0.7.tar.gz 446557 BLAKE2B 5527cc00c947cd139fe7836a689e706d08a1b74b1d4761c6a7de75259c4ef2afbb928b6d6ad1810af8477dd63e42d4eba3d98e3f5c4789b68061050cc17f428f SHA512 2431b5663f671bb0420a4780e5c7ae6fa566f73d59b30f2e1e087ea1e10efa5536ec8558facaa6c03967fe6ccd176a6fdafa4953e00490e295b5012780f47aa9
+DIST cutefish-settings-0.7.tar.gz 460641 BLAKE2B 881500afd00e6a848de7db617ea6cfc95328158890fb91090399f1e3812790f4bd9fbac1a426f118ae06179e5fdef52c57c5dcf64136138220cd9f8e00732a40 SHA512 19421fca8454f3d5ae3c2344a89415672af99311a34a54790042bcae5ebf53684f8e598a9e54eea785e2702123eb31f4691c8b7b82f251e7e3d5c64ff832fb81
+DIST cutefish-settings-0.8.tar.gz 461478 BLAKE2B 3c08166181d7ed9917b798b0e8302584aadbe5874267967eccd0a2f1cca960e2b725d073416baf54382cc03feb4eac3d10f99e173fed81e152991875dfd52d80 SHA512 abb724e999b0f339cd90a36efef3ce4249da24a186c33d026ac1ca30c858b702025d0b8e3fe7f0116b2cc0d217917b7ce1257c8f255b7ca4b8593c2031805e9c

cutefish-base/cutefish-settings/cutefish-settings-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-settings-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="abbaa8c7f0c5b267cd6d0478d6ebab97819e0078"
+	EGIT_COMMIT="a9584b3233d7a35c24e85bb25e41d6cc6026af0a"
 	SRC_URI="https://github.com/cutefishos/settings/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/settings-${EGIT_COMMIT}"
@@ -23,24 +23,27 @@ HOMEPAGE="https://github.com/cutefishos/settings"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
-	media-libs/fontconfig
+"
-	media-libs/freetype
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtx11extras
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
 	dev-libs/icu
-	kde-frameworks/kcoreaddons
+	x11-libs/libXi
-	kde-frameworks/modemmanager-qt
+	x11-libs/libXcursor
 	kde-frameworks/networkmanager-qt
+	kde-frameworks/modemmanager-qt
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-settings/cutefish-settings-0.8.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/settings.git"
+	EGIT_CHECKOUT_DIR=cutefish-settings-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/settings/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/settings-${PV}"
+fi
+
+DESCRIPTION="System Settings application for Cutefish Desktop"
+HOMEPAGE="https://github.com/cutefishos/settings"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtx11extras
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
+	dev-libs/icu
+	x11-libs/libXi
+	x11-libs/libXcursor
+	kde-frameworks/networkmanager-qt
+	kde-frameworks/modemmanager-qt
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-settings/cutefish-settings-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-settings-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="abbaa8c7f0c5b267cd6d0478d6ebab97819e0078"
+	SRC_URI="https://github.com/cutefishos/settings/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/settings/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/settings-${EGIT_COMMIT}"
+	S="${WORKDIR}/settings-${PV}"
 fi
 
 DESCRIPTION="System Settings application for Cutefish Desktop"
@@ -23,24 +22,27 @@ HOMEPAGE="https://github.com/cutefishos/settings"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
-	media-libs/fontconfig
+"
-	media-libs/freetype
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtx11extras
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
 	dev-libs/icu
-	kde-frameworks/kcoreaddons
+	x11-libs/libXi
-	kde-frameworks/modemmanager-qt
+	x11-libs/libXcursor
 	kde-frameworks/networkmanager-qt
+	kde-frameworks/modemmanager-qt
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

cutefish-base/cutefish-statusbar/Manifest

@@ -1 +1,2 @@
-DIST cutefish-statusbar-0.7.tar.gz 102037 BLAKE2B fe8d8c7a3b686366168e26dac81d28016aaf3b93e0f16238970c77681aec9046c8469d08d3089d31bf57f84e706a61e0b91c237d9d88bdeac7d907851c1e186f SHA512 91e206ba5fe5993c24b648324bc421abaeef128abde2c56c31cb4c2ccdb57646d7fa7125be58576462db0d693e2f9e590e1fa0f69528887f7f54a535e035755b
+DIST cutefish-statusbar-0.7.tar.gz 102342 BLAKE2B 31bc361c607c4969da28f2cbeac61ce2f70308d3d95877e304ec1e77aa54e1c0b45c90dabed5971046b93c7873fc75cabc7b61a8eabced9254538ddcd6392fad SHA512 88b4e03b2d4747455d4ffb71a9ee92607116d12761c32b58e3687a98cc5e39b75605318f950f6ef55d0361fa613ca2c3b018d00a92c1c808ee56770d8b26d58d
+DIST cutefish-statusbar-0.8.tar.gz 105676 BLAKE2B 1d6a669387731a6f5b7d0e3f99c65d168bacd0a007b5fd3a9ed69b8052307b596ad7e18ba31a565b64b20ca1769e1e179bd77a99e2748c974f8879613dabf01d SHA512 e28a3edaf8448bd3e4db5b6f79a505df424211d238f99f4f50fed3ad9582a782d0b27150f2407a35a0289e27ee2ca567e026c5b3354019ba49ac1175dffa6e26

cutefish-base/cutefish-statusbar/cutefish-statusbar-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-statusbar-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="460f94c00402bc1fab0b13d51ee4b82d108259d2"
+	EGIT_COMMIT="078a55144ef56166529de6ee4c9091af0bb2818b"
 	SRC_URI="https://github.com/cutefishos/statusbar/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/statusbar-${EGIT_COMMIT}"
@@ -23,21 +23,21 @@ HOMEPAGE="https://github.com/cutefishos/statusbar"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
-	dev-libs/libdbusmenu-qt
-	dev-qt/qtsvg
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtcore
-	dev-util/ninja
+	dev-qt/qtwidgets
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtdbus
-	dev-qt/assistant
+	dev-qt/qtx11extras
-	dev-qt/designer
+	dev-qt/qtconcurrent
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
+	dev-qt/qtquickcontrols2
+	kde-frameworks/kwindowsystem
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-statusbar/cutefish-statusbar-0.8.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/statusbar.git"
+	EGIT_CHECKOUT_DIR=cutefish-statusbar-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="821147fd9887ca815d81ee3f4158335146c39aaf"
+	SRC_URI="https://github.com/cutefishos/statusbar/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/statusbar-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Status of the system, such as time, system tray"
+HOMEPAGE="https://github.com/cutefishos/statusbar"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+	sys-libs/libcutefish
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtdbus
+	dev-qt/qtx11extras
+	dev-qt/qtconcurrent
+	dev-qt/linguist-tools
+	dev-qt/qtquickcontrols2
+	kde-frameworks/kwindowsystem
+"
+BDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-statusbar/cutefish-statusbar-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-statusbar-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="460f94c00402bc1fab0b13d51ee4b82d108259d2"
+	EGIT_COMMIT="821147fd9887ca815d81ee3f4158335146c39aaf"
 	SRC_URI="https://github.com/cutefishos/statusbar/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/statusbar-${EGIT_COMMIT}"
@@ -23,21 +23,21 @@ HOMEPAGE="https://github.com/cutefishos/statusbar"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 	sys-libs/libcutefish
-	dev-libs/libdbusmenu-qt
-	dev-qt/qtsvg
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtcore
-	dev-util/ninja
+	dev-qt/qtwidgets
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtdbus
-	dev-qt/assistant
+	dev-qt/qtx11extras
-	dev-qt/designer
+	dev-qt/qtconcurrent
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
+	dev-qt/qtquickcontrols2
+	kde-frameworks/kwindowsystem
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-terminal/Manifest

@@ -1 +1,2 @@
-DIST cutefish-terminal-0.7.tar.gz 248302 BLAKE2B 72aea288672edbac6c7ede0540c86108f67ef76988afd5bce7916d28ac0cf19e6cc9318e842261bfffb6a3d3cad51173fa4760ae934e6bc7049d020aaaf89a3b SHA512 35207444f12fe1ba7650ca6aa04ccc881a53ebf9d91a3159d696621f26b499bcb48364fd7c6ff8a761c49fe5d9ae13c7f053525cb1c77cd8a6ef2939fd7e1e78
+DIST cutefish-terminal-0.7.tar.gz 249205 BLAKE2B 6e440fa335b87c4d6a71b08bb6a48fe2267926288f7f847333e8601c4d45a46b23794e7efb6bdc6ccad39dfd51cd887e3f2bd6a7ecd884f772db81a81d8c1835 SHA512 1ce89f2711b0156fa82ef809900f51c5dda363bc2db2b9dfdd9fd7c0c0affdf162876f773e5788c0a359a0c0c604f3abed3b514356ef2809c4f58d5b5ea45686
+DIST cutefish-terminal-0.8.tar.gz 250167 BLAKE2B 8e3c32fb43f87fcf2c9d39625431fc905c78da13e036e579320577981e2d596084615ecf612f10e038f82c00f1c88a30af74f8ccfa55fa0779bb091d2cbf4ea6 SHA512 d0f5753a39e2c52440ee453c661ceb9dd8bead3e487a3ca313214df51ac6b70e1304b94576eb699a155387bcd5e97356ce8760d344111de9397bdc9687c36d43

cutefish-base/cutefish-terminal/cutefish-terminal-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-terminal-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="5d061c545fc17c356b6b114364173c0c25ecde43"
+	EGIT_COMMIT="3cd399fcd22525647f8cf2d610ebf2bf7082b74f"
 	SRC_URI="https://github.com/cutefishos/terminal/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/terminal-${EGIT_COMMIT}"
@@ -23,18 +23,17 @@ HOMEPAGE="https://github.com/cutefishos/terminal"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
-	dev-qt/qtsvg
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtcore
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtgui
-	dev-qt/assistant
+	dev-qt/qtquickcontrols2
-	dev-qt/designer
+	dev-qt/qtdbus
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-terminal/cutefish-terminal-0.8.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/terminal.git"
+	EGIT_CHECKOUT_DIR=cutefish-terminal-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="012ac1282abaa09713c04147831a4bd197d43364"
+	SRC_URI="https://github.com/cutefishos/terminal/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/terminal-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="A terminal emulator for Cutefish"
+HOMEPAGE="https://github.com/cutefishos/terminal"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/linguist-tools
+"
+BDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

cutefish-base/cutefish-terminal/cutefish-terminal-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-terminal-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="5d061c545fc17c356b6b114364173c0c25ecde43"
+	EGIT_COMMIT="012ac1282abaa09713c04147831a4bd197d43364"
 	SRC_URI="https://github.com/cutefishos/terminal/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/terminal-${EGIT_COMMIT}"
@@ -23,18 +23,17 @@ HOMEPAGE="https://github.com/cutefishos/terminal"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
-	dev-qt/qtsvg
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	kde-frameworks/extra-cmake-modules
+	dev-qt/qtcore
-	dev-qt/linguist-tools[qml]
+	dev-qt/qtgui
-	dev-qt/assistant
+	dev-qt/qtquickcontrols2
-	dev-qt/designer
+	dev-qt/qtdbus
-	dev-qt/qdbusviewer
+	dev-qt/linguist-tools
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-texteditor/Manifest

@@ -1 +1,2 @@
-DIST cutefish-texteditor-0.7.tar.gz 28537 BLAKE2B 7b29be5e119b96fcecc63c61d7a89530d637a7b406bf6bf835db589474691251afc2edccd29f9d57eec9638ebb2233a5fb100b8a1de6f1fb41a0c290e8c072c5 SHA512 786392c415a0b150f8c231b9346eb239d1e59c6aaf0172c66fe45ac2205a8aa3202a65add73d6ec2172ab2774b6ecff75552bbf20faa51d1cc87c8467b260ce4
+DIST cutefish-texteditor-0.7.tar.gz 56149 BLAKE2B 68aa8a473b6b00b3009ffc24f61b9caf18bafd1327be4da8cbfe1543fe9e1052aa597e5f1d0cfaecc33e69cdf80c60292c95f334e2f6737d67d58f1034e8984a SHA512 ec47a4aa27da2a7ff19554e4efdfa57af85aae87f1127fd8b3524b83ea7bf1802fe0f63af086164d7c32ed30d0fbeab84e1e9cb9d5135e8fa9229d7e33ed433d
+DIST cutefish-texteditor-0.8.tar.gz 58252 BLAKE2B 2066876b70471a95d59742d502355fa16cee02a604333b9c474ba2f2e87c6c54189c190707033c4c943aca51ff172676eb7939d4c3c2326029c01b5e16efd1a9 SHA512 fc6bb2b0ddbdd4da7c807efa99cc6f2f38491bca311f08f6238915dcaaee0ce6e962f2472c85043f1f81999c870adfb5d52338fec579e7f5b2a208821165a3e6

cutefish-base/cutefish-texteditor/cutefish-texteditor-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-texteditor-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="7967442827911ed8faf2a8faa6fea3fdc1907381"
+	EGIT_COMMIT="1f208792b7e8a863bf6ea624340288856976f180"
 	SRC_URI="https://github.com/cutefishos/texteditor/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/texteditor-${EGIT_COMMIT}"
@@ -23,19 +23,15 @@ HOMEPAGE="https://github.com/cutefishos/texteditor"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	dev-util/cmake
 	dev-qt/qtcore
-	dev-qt/qtgui
-	dev-qt/qtnetwork
 	dev-qt/qtdeclarative
-	kde-plasma/kdeplasma-addons
 	kde-frameworks/syntax-highlighting
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-texteditor/cutefish-texteditor-0.8.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/texteditor.git"
+	EGIT_CHECKOUT_DIR=cutefish-texteditor-${PV}
+	KEYWORDS=""
+else
+	EGIT_COMMIT="183b7a116803ab35fa4520552a0fcce742396d04"
+	SRC_URI="https://github.com/cutefishos/texteditor/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/texteditor-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Elegant text editor for Cutefish"
+HOMEPAGE="https://github.com/cutefishos/texteditor"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtdeclarative
+	kde-frameworks/syntax-highlighting
+"
+BDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	default
+}

cutefish-base/cutefish-texteditor/cutefish-texteditor-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-texteditor-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="7967442827911ed8faf2a8faa6fea3fdc1907381"
+	EGIT_COMMIT="183b7a116803ab35fa4520552a0fcce742396d04"
 	SRC_URI="https://github.com/cutefishos/texteditor/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/texteditor-${EGIT_COMMIT}"
@@ -23,19 +23,15 @@ HOMEPAGE="https://github.com/cutefishos/texteditor"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
 "
-BDEPEND="${DEPEND}
+DEPEND="
-	dev-util/cmake
 	dev-qt/qtcore
-	dev-qt/qtgui
-	dev-qt/qtnetwork
 	dev-qt/qtdeclarative
-	kde-plasma/kdeplasma-addons
 	kde-frameworks/syntax-highlighting
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-videoplayer/cutefish-videoplayer-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,18 +24,14 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 RDEPEND=""
-DEPEND="dev-qt/qtquickcontrols2[widgets]
+DEPEND="
+	dev-qt/qtcore
 	dev-qt/qtdeclarative
+	dev-qt/qtdbus
+	dev-qt/linguist-tools
 	media-video/mpv[libmpv]
-	net-misc/youtube-dl
-"
-BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-videoplayer/cutefish-videoplayer-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,18 +24,14 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 RDEPEND=""
-DEPEND="dev-qt/qtquickcontrols2[widgets]
+DEPEND="
+	dev-qt/qtcore
 	dev-qt/qtdeclarative
+	dev-qt/qtdbus
+	dev-qt/linguist-tools
 	media-video/mpv[libmpv]
-	net-misc/youtube-dl
-"
-BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
+BDEPEND="${DEPEND}"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-wallpapers/cutefish-wallpapers-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,10 +24,7 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND=""
-BDEPEND="${DEPEND}
+BDEPEND="${DEPEND}"
-	kde-frameworks/extra-cmake-modules
-	dev-util/ninja
-"
 
 src_configure(){
 	mycmakeargs=(

cutefish-base/cutefish-wallpapers/cutefish-wallpapers-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,10 +24,7 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND=""
-BDEPEND="${DEPEND}
+BDEPEND="${DEPEND}"
-	kde-frameworks/extra-cmake-modules
-	dev-util/ninja
-"
 
 src_configure(){
 	mycmakeargs=(

sys-libs/cutefish-core/Manifest

@@ -1 +1,2 @@
-DIST cutefish-core-0.7.tar.gz 163316 BLAKE2B 0dd28f22e4714a603da370fdcc17592a4a729fdadb6a7c039f44ad01c619a7e4fd1274c98a2118326ad076eb04cedf94662b06d2363e049c5cd1dc091a5e746e SHA512 752ae18a5b95ea8ffe73bf6608ce3e8c127c69736f985b5542c05fa6f1ffd98ae3755b531240f789361de90a6aa1af8c28e3266d34823f8c76eb0f0e4cb28e14
+DIST cutefish-core-0.7.tar.gz 167088 BLAKE2B b2f364a3b55d5d5c5040e2d7cc6c272103bf9509235cceb0001940c3cb727014bc7524a8e336bcaaa9b414251b1f6dc09a448617edcfb95c4b90110bd8178d22 SHA512 5070866426341617070de9fae164d238bfc73ed1f689c62117fcdd03d6a17f78d8790f239480624953023ddfb26b069e670b011668b9c3ba8ec45bd675d7beac
+DIST cutefish-core-0.8.tar.gz 168844 BLAKE2B 4b469daec5cc3f680871da5fbd263d7b48fbff906b1e7aaf97a81f4de8f884a2d63d5ae6bd0cad5594855ff95f72990fd10b1e9f8cfa923a2f63e4a51af5d1e9 SHA512 e796e335f6465c6e68e3c533f38209206f2043f286aadd501a17180349cf4380fda604fbb32e1a13d541c34f8926785ed6a878a7bb1fb2691d546a99e82ab3ca

sys-libs/cutefish-core/cutefish-core-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-core-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="1f29e396414e90d455faa83407208aaa17760ab3"
+	EGIT_COMMIT="97fc1bdffe1acef83409cc8098bb5648fa659d77"
 	SRC_URI="https://github.com/cutefishos/core/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/core-${EGIT_COMMIT}"
@@ -23,23 +23,29 @@ HOMEPAGE="https://github.com/cutefishos/core"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
-	media-sound/pulseaudio
+"
-	x11-libs/libXtst
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtx11extras
+	dev-qt/linguist-tools
 	sys-auth/polkit-qt
+	kde-frameworks/kwindowsystem
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kidletime
 	x11-drivers/xf86-input-libinput
 	x11-drivers/xf86-input-synaptics
 	x11-misc/appmenu-gtk-module
+	x11-libs/libXinerama
+	x11-libs/libXcursor
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

sys-libs/cutefish-core/cutefish-core-0.8.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/core.git"
+	EGIT_CHECKOUT_DIR=cutefish-core-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/core/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/core-${PV}"
+fi
+
+DESCRIPTION="System components and backend of CutefishOS"
+HOMEPAGE="https://github.com/cutefishos/core"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND="
+	sys-libs/fishui
+"
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtx11extras
+	dev-qt/linguist-tools
+	sys-auth/polkit-qt
+	kde-frameworks/kwindowsystem
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kidletime
+	x11-drivers/xf86-input-libinput
+	x11-drivers/xf86-input-synaptics
+	x11-misc/appmenu-gtk-module
+	x11-libs/libXinerama
+	x11-libs/libXcursor
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

sys-libs/cutefish-core/cutefish-core-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,10 +12,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=cutefish-core-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="1f29e396414e90d455faa83407208aaa17760ab3"
+	SRC_URI="https://github.com/cutefishos/core/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/core/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/core-${EGIT_COMMIT}"
+	S="${WORKDIR}/core-${PV}"
 fi
 
 DESCRIPTION="System components and backend of CutefishOS"
@@ -23,23 +22,29 @@ HOMEPAGE="https://github.com/cutefishos/core"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
-RDEPEND=""
+RDEPEND="
-DEPEND="
 	sys-libs/fishui
-	media-sound/pulseaudio
+"
-	x11-libs/libXtst
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtgui
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtx11extras
+	dev-qt/linguist-tools
 	sys-auth/polkit-qt
+	kde-frameworks/kwindowsystem
+	kde-frameworks/kcoreaddons
+	kde-frameworks/kidletime
 	x11-drivers/xf86-input-libinput
 	x11-drivers/xf86-input-synaptics
 	x11-misc/appmenu-gtk-module
+	x11-libs/libXinerama
+	x11-libs/libXcursor
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

sys-libs/fishui/Manifest

@@ -1 +1,2 @@
-DIST fishui-0.7.tar.gz 81540 BLAKE2B 69bcbcf9d19bd17ea1794c6cfb4c9292ca709ca15b6e6cb92f0abaafa0c775961b5ff8e06e05f1eacc0573c2ad7ed79adf4cfb89dc7027349eb2faa6e1293ce5 SHA512 c0cf7dae4cdabe30a6a022f52b8422648fb46309e364d63bb1737c9cb119e3e7242d21d604d62320a4da3e1dca8bd83c32a4000729ffcc152736307f44bc2571
+DIST fishui-0.7.tar.gz 81644 BLAKE2B e59f3bbd8f971693f09bbc1da1f3ccce3f759b8c73416d19a0f4bbea7d1258a234e8f0ff4e17f2df924f65e28cdffb580ba2396c1255c93557413842caa27859 SHA512 2e3a51aa8db33b37e5c5670c5c33cdcd2b13c4af91014486c836472a92364cb247d46ea3bfa3547c547a9eac50070c3e18d8dbc83a081d225d1a591654b39b6e
+DIST fishui-0.8.tar.gz 84593 BLAKE2B 08b42f06fdd132cc1921023b5fb79f76d95f4700402e2c9020047f52cb4a57cd67732d3543899094dbf5381782e5d0951d330ac21a74fde87ce43a3778871565 SHA512 9cfbf51901aa79341b66bdbd21f87b480ec9a6640aec09f56e9e046b5aa88ee05a890c1872ac47bed1eb053b9ce958d189b7e9287908708e7bed6ae5f0946cb6

sys-libs/fishui/fishui-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${PN}-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="1d37a00d0aba69076f179c6dcdfd2f17e55b9516"
+	EGIT_COMMIT="11697565e149c37f67c4707f07a996528cb10e3f"
 	SRC_URI="https://github.com/cutefishos/fishui/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
 	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
@@ -24,16 +24,13 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
-	kde-frameworks/kwindowsystem
+	dev-qt/qtcore
-	dev-qt/qtquickcontrols2[widgets]
+	dev-qt/qtwidgets
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

sys-libs/fishui/fishui-0.8.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cutefishos/fishui.git"
+	EGIT_CHECKOUT_DIR=${PN}-${PV}
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/cutefishos/fishui/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+	S="${WORKDIR}/${PN}-${PV}"
+fi
+
+DESCRIPTION="GUI library based on QQC2 for Cutefish applications"
+HOMEPAGE="https://github.com/cutefishos/fishui"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+RDEPEND=""
+DEPEND="
+	dev-qt/qtcore
+	dev-qt/qtwidgets
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
+"
+BDEPEND="${DEPEND}
+	dev-util/ninja
+"
+
+src_configure(){
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}

sys-libs/fishui/fishui-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${PN}-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="1d37a00d0aba69076f179c6dcdfd2f17e55b9516"
+	SRC_URI="https://github.com/cutefishos/fishui/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/fishui/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	S="${WORKDIR}/${PN}-${PV}"
 fi
 
 DESCRIPTION="GUI library based on QQC2 for Cutefish applications"
@@ -24,16 +23,13 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
-	kde-frameworks/kwindowsystem
+	dev-qt/qtcore
-	dev-qt/qtquickcontrols2[widgets]
+	dev-qt/qtwidgets
+	dev-qt/qtquickcontrols2
+	dev-qt/qtdbus
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

sys-libs/libcutefish/Manifest

@@ -1 +1 @@
-DIST libcutefish-0.7.tar.gz 161735 BLAKE2B 629ba3e4a2112e1bf3c67bb4adeb2cc446d1a4a07a4dca7d834c7cc5f82062c97b84d19f06c6a0f398024941c9f02c05533c6398e0f160427238c383fa4f0079 SHA512 26daeb7334d53ee3d4718717d16ba92f28a71066681439114f7436d08df47a0dd062f2728fed9b9cce1666d85576e75b130f5d8827d523d7140bd9869f42ff0b
+DIST libcutefish-0.7.tar.gz 162420 BLAKE2B 992e0e2cb5d6102bdf66469852ca2920bfbb243e523cdee1d47612869ffdb054dc7f86a6403e42385e82874520605aab4a6041aabb6df74fcc81f97425ce8be2 SHA512 86f6a6d29091e1d23cdb4d5455cf6dc8c72b888a99e80cea1f4c19f1406a041f74ca41e7527404d8cdc569f448964c71be224742cf15370f98e49c147e4e802f

sys-libs/libcutefish/libcutefish-0.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${PN}-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="5e1c2eff2fcd8b54cf5dc8eec6710cb45e50beea"
+	SRC_URI="https://github.com/cutefishos/libcutefish/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/libcutefish/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	S="${WORKDIR}/${PN}-${PV}"
 fi
 
 DESCRIPTION="System library for Cutefish applications"
@@ -24,20 +23,23 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
-	kde-plasma/kscreen
+	dev-qt/qtcore
-	kde-frameworks/modemmanager-qt
+	dev-qt/qtgui
-	kde-frameworks/networkmanager-qt
+	dev-qt/qtdeclarative
-	dev-qt/qtquickcontrols2[widgets]
+	dev-qt/qtquickcontrols2
-	sys-apps/accountsservice
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtconcurrent
 	kde-frameworks/bluez-qt
+	kde-frameworks/networkmanager-qt
+	kde-frameworks/modemmanager-qt
+	kde-plasma/libkscreen
+	kde-frameworks/kio
+	dev-qt/qtsensors
+	media-libs/libcanberra[pulseaudio]
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){

sys-libs/libcutefish/libcutefish-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,10 +11,9 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${PN}-${PV}
 	KEYWORDS=""
 else
-	EGIT_COMMIT="5e1c2eff2fcd8b54cf5dc8eec6710cb45e50beea"
+	SRC_URI="https://github.com/cutefishos/libcutefish/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/cutefishos/libcutefish/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv"
-	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	S="${WORKDIR}/${PN}-${PV}"
 fi
 
 DESCRIPTION="System library for Cutefish applications"
@@ -24,20 +23,23 @@ SLOT="0"
 IUSE=""
 RDEPEND=""
 DEPEND="
-	kde-plasma/kscreen
+	dev-qt/qtcore
-	kde-frameworks/modemmanager-qt
+	dev-qt/qtgui
-	kde-frameworks/networkmanager-qt
+	dev-qt/qtdeclarative
-	dev-qt/qtquickcontrols2[widgets]
+	dev-qt/qtquickcontrols2
-	sys-apps/accountsservice
+	dev-qt/qtdbus
+	dev-qt/qtxml
+	dev-qt/qtconcurrent
 	kde-frameworks/bluez-qt
+	kde-frameworks/networkmanager-qt
+	kde-frameworks/modemmanager-qt
+	kde-plasma/libkscreen
+	kde-frameworks/kio
+	dev-qt/qtsensors
+	media-libs/libcanberra[pulseaudio]
 "
 BDEPEND="${DEPEND}
-	kde-frameworks/extra-cmake-modules
 	dev-util/ninja
-	dev-qt/linguist-tools[qml]
-	dev-qt/assistant
-	dev-qt/designer
-	dev-qt/qdbusviewer
 "
 
 src_configure(){