Merge branch 'microcai:master' into master

.github/workflows/overlay.toml

@@ -943,6 +943,13 @@ github = "Fndroid/clash_for_windows_pkg"
 use_latest_release = true
 github_account = "irort"
 
+["net-proxy/clash-verge"]
+source = "github"
+github = "zzzgydi/clash-verge"
+use_latest_release = true
+prefix = "v"
+github_account = "liuyujielol"
+
 ["net-proxy/dae"]
 source = "github"
 github = "daeuniverse/dae"

app-i18n/fcitx-chewing/Manifest

@@ -1 +1 @@
-DIST fcitx-chewing-5.1.0.tar.gz 26410 BLAKE2B ac6fdbad57a0427d40358d3f56b75deef8d2dfc8bc5e97cec26014e30538e1a351a5ee7883c27e27af0c67e49e3e3925f102f32c72d32c290c13091593beb921 SHA512 ec090f752e0033b46a179fda730a7578e3230cedea0e795eddeb148523f8b9a776a075aedab19be65b8dae51ebc0a6de6eba567fe4b65b89e74703cb742137c7
+DIST fcitx-chewing-5.1.1.tar.gz 26454 BLAKE2B d301b8909cdc8e30e1f1475c43fbbc2fcb6496c60efac83a791524247cbd5a14a85749913c2ee4f7951e9a13ae3e5ecbc44c56d9a3d01f04d52d309c82b08a26 SHA512 d88aad759398bca9417a0d77f5a897212a52b3ce9b7d4a891bd0ba9a86c2e3db7b9dd5525ffbc72baaa951b0024085f6eade6cbf62591a628303397164fd5856

app-i18n/fcitx-chewing/fcitx-chewing-5.1.0.ebuild → app-i18n/fcitx-chewing/fcitx-chewing-5.1.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

app-i18n/fcitx-chinese-addons/Manifest

@@ -1 +1 @@
-DIST fcitx5-chinese-addons-5.1.1_dict.tar.xz 882340 BLAKE2B c7c28a00bc22c3614ddd904c0cd78486f7512259d58055b216551245366e26625e0649e89f5fa5b11091ee0279664f2dba09a57bf8e1cfbccdd83694e496a05e SHA512 e336cfa88bed8b6164a33186900ebd376cf0ce57e3cde3ad64435c0c8ed65a0cce1791327169cc023c52f180f8b91e3464cb345cbd4cd7efca5473fa1647cc17
+DIST fcitx5-chinese-addons-5.1.2_dict.tar.xz 883388 BLAKE2B 7db9fcd8b9fddce9db5b0cf23e5300d7a246183184c32d8292a92617f5b66bebd81a5876cb197508676266c39fbeae5a17fd659feadab0a41be1df948c9663fe SHA512 8a94b974b461dc0a20ee7c243d482295359be27a7cc2152755aebdde3330a62f579506666e231d15cd081e58794359f1791b674f8d9f873babf7c68f4dea81a1

app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.1.ebuild → app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.2.ebuild

@@ -29,7 +29,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-i18n/fcitx-5.0.24:5
+	>=app-i18n/fcitx-5.1.2:5
 	>=app-i18n/libime-1.1.2:5
 
 	>=dev-libs/boost-1.61:=

app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-i18n/fcitx-5.0.24:5
+	>=app-i18n/fcitx-5.1.2:5
 	>=app-i18n/libime-1.1.2:5
 
 	>=dev-libs/boost-1.61:=

app-i18n/fcitx-configtool/Manifest

@@ -1 +1 @@
-DIST fcitx-configtool-5.1.0.tar.gz 155700 BLAKE2B bac0a26765e9ced1b3d3e8044bc804335c2108251ba992778378ef0a5ed235c59394982510864f9f2693689bdd6f8cf997f8474916f8f15018d70fc7b103b208 SHA512 4e2c07c04e2084a2ed473f379247cac5dde1bcf592454355524342b7995d12c297fd1a844aba493c11506667f6b6d5d078081905ba91dbf0e6b6c17d5d49922b
+DIST fcitx-configtool-5.1.2.tar.gz 155807 BLAKE2B a00d37737cf03da2f7d48650d14bb905b87266d27646e0a500fc9e8adb366ed16762bf8cf796f58c2060a8065b9f2c43e8f00d46c5f0dd23f69960abb80007be SHA512 757d9642f52e77de17117b32c990a7cfe1dea181326542b9628101130390e785277de408a85345cf2ebe2781eca5c80410a3c23db261d857d6cf66435312c1f2

app-i18n/fcitx-configtool/fcitx-configtool-5.1.0.ebuild → app-i18n/fcitx-configtool/fcitx-configtool-5.1.2.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -23,23 +23,30 @@ SLOT="5"
 IUSE="kcm +config-qt test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-i18n/fcitx:5
+RDEPEND="
+	app-i18n/fcitx:5
 	app-i18n/fcitx-qt:5[qt5,-onlyplugin]
 	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	kde-frameworks/kwidgetsaddons:5
 	virtual/libintl
 	x11-libs/libX11
+	x11-libs/libxkbcommon
 	x11-libs/libxkbfile
 	kcm? (
+		dev-qt/qtquickcontrols2:5
 		kde-frameworks/kconfigwidgets:5
 		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kdeclarative:5
 		kde-frameworks/ki18n:5
+		kde-frameworks/kiconthemes:5
 		kde-frameworks/kirigami:5
-		kde-frameworks/kdeclarative:5
+		kde-frameworks/kpackage:5
+		kde-frameworks/plasma:5
 	)
 	config-qt? (
 		kde-frameworks/kitemviews:5

app-i18n/fcitx-configtool/fcitx-configtool-9999.ebuild

@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -23,23 +23,30 @@ SLOT="5"
 IUSE="kcm +config-qt test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-i18n/fcitx:5
+RDEPEND="
+	app-i18n/fcitx:5
 	app-i18n/fcitx-qt:5[qt5,-onlyplugin]
 	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	kde-frameworks/kwidgetsaddons:5
 	virtual/libintl
 	x11-libs/libX11
+	x11-libs/libxkbcommon
 	x11-libs/libxkbfile
 	kcm? (
+		dev-qt/qtquickcontrols2:5
 		kde-frameworks/kconfigwidgets:5
 		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kdeclarative:5
 		kde-frameworks/ki18n:5
+		kde-frameworks/kiconthemes:5
 		kde-frameworks/kirigami:5
-		kde-frameworks/kdeclarative:5
+		kde-frameworks/kpackage:5
+		kde-frameworks/plasma:5
 	)
 	config-qt? (
 		kde-frameworks/kitemviews:5

app-i18n/fcitx-hangul/Manifest

@@ -1 +1 @@
-DIST fcitx5-hangul-5.1.0.tar.xz 39176 BLAKE2B 716e4cbc9747d39839e465d057ccb3975e8dc1911105153e2bda298d66ff70ebbfea94997e45c4bc4b35acaa1d2ecd93cd096f3b2479348b3db5d68e752b4147 SHA512 d72caac5477c641612b07404a7e8b1dc1663fcff75e8c463aea1e3d9e2a31fdaab23aa78b4256d9036ce199c7ab9b21a1765dc6c86f88352948a447dcab76d1e
+DIST fcitx5-hangul-5.1.1.tar.xz 39296 BLAKE2B 4fadc20e5b312e4e40f592c24d7e724d3d6adb0cef2539a27e624758c5d7d79490ac3dcf960b37e3c2ab451098b1ff9424aea77cf2d9eeaca9b9ba5eaee538bf SHA512 7b16a81cee1448de2428a96f89ce0a4e41f51e8c3f9beb930b068147ef7d93e227081f65ede0d799d1e15692e4742da3ab864fb652fa1812bd5de24da7e3a2f7

app-i18n/fcitx-hangul/fcitx-hangul-5.1.0.ebuild → app-i18n/fcitx-hangul/fcitx-hangul-5.1.1.ebuild

@@ -1,25 +1,22 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/fcitx/fcitx5-hangul"
-fi
+DESCRIPTION="Korean Hangul input method for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-hangul"
 
 MY_PN="fcitx5-hangul"
 MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-DESCRIPTION="Korean Hangul input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-hangul"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
-	SRC_URI=""
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx5-hangul"
 else
 	SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 LICENSE="GPL-2+"
@@ -36,11 +33,3 @@ DEPEND=">=app-i18n/fcitx-5.0.2:5
 RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

app-i18n/fcitx-qt/Manifest

@@ -1 +1 @@
-DIST fcitx-qt-5.1.1.tar.gz 140855 BLAKE2B 570cab3a70ad8d0d3f7d94551f9e40fb8310983ea275a700a66ac0851a038557c962a8676e1f80e65f631aff4e39808e21a150a8bba0cb8fbfab698b2fb498f3 SHA512 337e752aa350faa944a247ff2a87c8f52005ae6aba50f6e988b74678c06aac66c7c2725bedb396a26ff9ee6d909d0d45b858fc4eddccf4fffb96954eb823d806
+DIST fcitx-qt-5.1.2.tar.gz 141973 BLAKE2B 7cf029198cad12d34a8799686acb30d59c4538655b3df888491557f7e99c61bdec31e06e391402b273e626ca83b597a49beadf2535dc423deb0c759ce422b109 SHA512 0d97c32ec7985d76680194953442c0c3ceee6eaebb76d18874582fc256f2c0f0a190afb051c3db2252604be90182d5796f312f50136e50a6708a3441664da9f3

app-i18n/fcitx-qt/fcitx-qt-5.1.1.ebuild → app-i18n/fcitx-qt/fcitx-qt-5.1.2.ebuild

@@ -39,7 +39,7 @@ RDEPEND="
 	x11-libs/libxkbcommon
 
 	qt6? (
-		dev-qt/qtbase:6[dbus,gui]
+		dev-qt/qtbase:6[dbus,gui,widgets]
 	)
 	kde-frameworks/extra-cmake-modules:5
 "

app-i18n/fcitx-qt/fcitx-qt-9999.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,7 +39,7 @@ RDEPEND="
 	x11-libs/libxkbcommon
 
 	qt6? (
-		dev-qt/qtbase:6[dbus,gui]
+		dev-qt/qtbase:6[dbus,gui,widgets]
 	)
 	kde-frameworks/extra-cmake-modules:5
 "

app-i18n/fcitx-rime/Manifest

@@ -1 +1 @@
-DIST fcitx-rime-5.1.2.tar.gz 52298 BLAKE2B 5bbf4118a94da5b0c6767c466d28d40d5ba9414b312a76c34b06cc4cc83c3302d18b2680c882d886c7a1862b889e1ae27e7baab2827c4bb0f24abde550af4454 SHA512 a72c05029c022a92979ead160ac55ba3afa8f594ef881173acd559f53635c146c9dd8f8b2386e04a92cf191497ef377c79ec67d7471e1d04a6fcd94fcabf1367
+DIST fcitx-rime-5.1.3.tar.gz 55175 BLAKE2B b78ed8515eb8e89686cb1343e274157abd86d30042faa062ffafe50ef630d3de92c199151e905fd352c4a9142403c6bef4e3af110ca0975987d355092c7ba36f SHA512 eded2b731db1f7d46589f400fcb4ff42c78d23a6d9e24e5ce90faff1172e799103a6d6a3bebdadb69d490848f7dab546031d63c4ff0ebbf9d4eee466248b884c

app-i18n/fcitx/Manifest

@@ -1,3 +1,3 @@
 DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
-DIST fcitx-5.1.1.tar.gz 7492698 BLAKE2B 61a9897b496f39599e9f5267ffa31a9d022b9780153679d4ca55203dfe1f2e0768ff7e3bcc5d5a4da0edd29f8e66fc737ed14f4482f22a4fd64aac5627fea676 SHA512 6c5f89064db9707f999dc31137e50a1eb2e5c76ac155bd6f6f802a03ea43f2b97a7d2d813a8c62a3454bdd9d3bfc8845d75b399ea41479948dc468bbcd20c29c
+DIST fcitx-5.1.2.tar.gz 7511922 BLAKE2B 307fb389f39f1450f4b402e9a2b4af91a8a832d6f50d8e98eb220ebc92748bb6cf4de2e718fd317b0e17a06937ce1ffcd78b305d196281a0dffbee6ce42504ec SHA512 bff70f465e4c891b074183d9f1fbd9656e7f8357143c492749d46fe219a880fd767707594dd419a94fc2d1de77e865b494cf502c7a67a0b3e093c6699f6a9152
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2

app-i18n/fcitx/fcitx-4.2.9.8.ebuild

@@ -4,7 +4,7 @@
 EAPI="7"
 LUA_COMPAT=(lua{5-1,5-2,5-3,5-4})
 
-inherit cmake gnome2-utils lua-single xdg-utils
+inherit cmake gnome2-utils lua-single xdg
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -28,7 +28,7 @@ fi
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="4"
 KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb qt4"
+IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb"
 REQUIRED_USE="cairo? ( X )
 	lua? ( ${LUA_REQUIRED_USE} )
 	pango? ( cairo )"
@@ -113,7 +113,7 @@ src_configure() {
 		-DENABLE_LUA=$(usex lua ON OFF)
 		-DENABLE_OPENCC=$(usex opencc ON OFF)
 		-DENABLE_PANGO=$(usex pango ON OFF)
-		-DENABLE_QT=$(usex qt4 ON OFF)
+		-DENABLE_QT=OFF
 		-DENABLE_QT_GUI=OFF
 		-DENABLE_QT_IM_MODULE=OFF
 		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi)
@@ -138,9 +138,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postinst
 	use gtk2 && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 
@@ -151,9 +149,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	xdg_pkg_postrm
 	use gtk2 && gnome2_query_immodules_gtk2
 	use gtk3 && gnome2_query_immodules_gtk3
 }

app-i18n/fcitx/metadata.xml

@@ -14,7 +14,6 @@
 		<flag name="enchant">Enable Enchant backend (using <pkg>app-text/enchant</pkg>) for spelling hinting</flag>
 		<flag name="gtk2">Install input method module for GTK+ 2</flag>
 		<flag name="gtk3">Install input method module for GTK+ 3</flag>
-		<flag name="qt4">Install input method module for QT4</flag>
 		<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
 		<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
 		<flag name="table">Install table input methods for Simplified Chinese</flag>

app-i18n/libime/Manifest

@@ -1 +1 @@
-DIST libime-1.1.2_dict.tar.xz 36437416 BLAKE2B b62707fa24ae53c556b1253b8c8fc2193396de73a34f40ec41037fb07e09a29e88223784a03224ecbd589a35025776c96f1d140db83b10e3d909c5afa11cdc4d SHA512 4680f302d7f350c655e36376df2864a5d9e791c711e3bbd68d6f423ef5345866d0bffd1a708ca2916b8f19184b99c38878bba90deed135ad8c574035adb7767a
+DIST libime-1.1.3_dict.tar.xz 36438528 BLAKE2B 2577362aeddf398b9ee7d29c71d157f7aef67b30d2463719ed020eaaa98e955c83b8a7df1e90e4519ae13d2146eff440dafdb93d723a2feaeb60f96e70633410 SHA512 5079721651df334292fbcc6275ded55d41c6380183ef5487be558e93b551a6a6d651fb0fa0456c1d40ffdae432bf51375058fdcf631ea8a93c8751530642fc92

app-i18n/libime/libime-1.1.2.ebuild → app-i18n/libime/libime-1.1.3.ebuild

@@ -20,13 +20,14 @@ HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/libime"
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="5"
 IUSE=""
-REQUIRED_USE=""
 
 RDEPEND="app-i18n/fcitx:5"
 DEPEND="${RDEPEND}
-	dev-libs/boost
+	app-arch/zstd:=
+	dev-libs/boost:=
 	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	cmake_src_prepare
@@ -44,7 +45,3 @@ src_configure() {
 	)
 	cmake_src_configure
 }
-
-src_install(){
-	cmake_src_install
-}

app-i18n/libime/libime-9999.ebuild

@@ -20,13 +20,14 @@ HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/libime"
 LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
 SLOT="5"
 IUSE=""
-REQUIRED_USE=""
 
 RDEPEND="app-i18n/fcitx:5"
 DEPEND="${RDEPEND}
-	dev-libs/boost
+	app-arch/zstd:=
+	dev-libs/boost:=
 	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	cmake_src_prepare

dev-lang/quickjs/Manifest

@@ -0,0 +1 @@
+DIST quickjs-2021-03-27.tar.xz 753556 BLAKE2B a959da95ca4861b5675359ac81598b50a80170ec4f4d819c44d666dd4ecb5a2e11d63230f98b611d5109941f5b21f5c8f791d56d153b818408ec1c59350d5e1d SHA512 eeb810083484df213bc658a8703ca3ef094b7789c2b49eed86cb4068c9f9da401ad0300261d61a163c6ea82306f3ef50bf8e29a64920f704fd8958ef08a7286c

dev-lang/quickjs/files/quickjs-2020.11.08_Remove-TTY-check-in-test.patch

@@ -0,0 +1,25 @@
+From aa3c213319f6df61f727a604798e8c120b7c37f4 Mon Sep 17 00:00:00 2001
+From: tastytea <[email protected]>
+Date: Fri, 30 Apr 2021 00:03:42 +0200
+Subject: [PATCH] Remove TTY check in test.
+
+---
+ tests/test_std.js | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/test_std.js b/tests/test_std.js
+index 3ea6e34..a12cb81 100644
+--- a/tests/test_std.js
++++ b/tests/test_std.js
+@@ -143,8 +143,6 @@ function test_os()
+ {
+     var fd, fpath, fname, fdir, buf, buf2, i, files, err, fdate, st, link_path;
+
+-    assert(os.isatty(0));
+-
+     fdir = "test_tmp_dir";
+     fname = "tmp_file.txt";
+     fpath = fdir + "/" + fname;
+-- 
+2.26.3
+