Merge branch 'master' into lenovo-y480

2026-03-16 18:29:56 +08:00
parent 8546d80f65 9ce32f5670
commit 9f6e953495
15 changed files with 371 additions and 32 deletions
--- a/gentoo_portage/binrepos.conf
+++ b/gentoo_portage/binrepos.conf
@@ -1,3 +1,4 @@
 [binhost]
 priority = 9999
-sync-uri = http://mirrors.ustc.edu.cn/gentoo/releases/amd64/binpackages/23.0/x86-64/
+sync-uri = https://distfiles.gentoo.org/releases/amd64/binpackages/23.0/x86-64/
+# sync-uri = http://mirrors.ustc.edu.cn/gentoo/releases/amd64/binpackages/23.0/x86-64/
--- a/gentoo_portage/package.accept_keywords
+++ b/gentoo_portage/package.accept_keywords
@@ -12,7 +12,7 @@ app-i18n/fcitx-rime ~amd64
 app-i18n/librime ~amd64

 # tree sitter
-dev-libs/tree-sitter* ~amd64
+# dev-libs/tree-sitter* ~amd64

 # audroid studio
 dev-util/android-studio::gentoo ~amd64
@@ -37,4 +37,9 @@ media-sound/bluez-alsa ~amd64
 */*-bin ~amd64

 net-wireless/iwgtk ~amd64
-sys-fs/jmtpfs ~amd64
+sys-fs/jmtpfs ~amd64
+
+app-office/wps-office ~amd64
+
+# rustup
+dev-util/rustup ~amd64
--- a/gentoo_portage/package.mask
+++ b/gentoo_portage/package.mask
@@ -1,3 +1,2 @@
-app-office/wps-office::gentoo-zh
 dev-lang/rust
 net-proxy/shadowsocks-rust::gentoo-zh
--- a/gentoo_portage/package.use
+++ b/gentoo_portage/package.use
@@ -114,4 +114,7 @@ llvm-core/clang xml
 llvm-core/llvm xml

 # freetype
-media-libs/freetype harfbuzz
+media-libs/freetype harfbuzz
+
+# watchman
+dev-cpp/glog gflags