Merge branch 'master' into lenovo-y480

gentoo_portage/ccache.conf

@@ -1,5 +1,11 @@
 # Maximum cache size to maintain
-max_size = 20.0G
+max_size = 50.0G
 
 # Allow others to run 'ebuild' and share the cache.
 umask = 002
+
+compiler_check = %compiler% -dumpversion
+
+cache_dir = /var/cache/ccache
+# chown distcc:portage /var/cache/ccache
+# chmod 2775 /var/cache/ccache

gentoo_portage/make.conf

@@ -20,10 +20,14 @@ QUICKPKG_DEFAULT_OPTS="--include-config y"
 BINPKG_FORMAT="gpkg"
 EMERGE_DEFAULT_OPTS="--buildpkg --buildpkg-exclude \"virtual/* sys-kernel/*-sources */*-bin\" ${EMERGE_DEFAULT_OPTS}"
 
-# ccache and distcc
-# FEATURES="distcc ${FEATURES}"
-# CCACHE_DIR="/var/cache/ccache"
-# FEATURES="ccache ${FEATURES}"
+# distcc
+FEATURES="distcc ${FEATURES}"
+DISTCC_DIR="/var/tmp/distcc"
+
+# ccache
+FEATURES="ccache ${FEATURES}"
+CCACHE_DIR="/var/cache/ccache"
+CCACHE_UMASK="0002"
 
 # ABI_X86="32 64"
 ALSA_CARDS="hda-intel"
@@ -34,8 +38,7 @@ VIDEO_CARDS="amdgpu dummy fbdev intel nouveau radeon radeonsi vesa"
 GENTOO_MIRRORS="
 http://distfiles.gentoo.org/
 "
-MAKEOPTS="-j4 ${MAKEOPTS}"
 
-DESKTOP_USE="X alsa apng dbus fbcon ffmpeg flac fuse gif gtk gtk2 gtk3 http2 icu jack jpeg mp3 mp4 mpeg mtp nvidia ogg opengl pdf png pipewire pulseaudio svg tiff unicode vaapi vdpau webp xinerama xv xvmc"
+DESKTOP_USE="X alsa apng dbus fbcon ffmpeg flac fuse gif gtk gtk2 gtk3 http2 icu jack jpeg mp3 mp4 mpeg mtp nvidia ogg opengl pdf png pipewire pulseaudio svg tiff unicode vaapi vdpau vulkan webp xinerama xv xvmc"
 #USE="${USE} ${DESKTOP_USE} consolekit cups policykit pulseaudio truetype udev xft xcb xkb -bluetooth -gpm -libva -modemmanager"
 USE="${USE} ${DESKTOP_USE} bluetooth cups elogind policykit truetype udev xft xcb xkb -gpm -libva -modemmanager"

gentoo_portage/package.accept_keywords

@@ -2,7 +2,6 @@
 app-editors/cursor ~amd64
 app-editors/emacs **
 app-editors/vscode ~amd64
-app-emacs/emacs-common ~amd64
 
 # imput method
 app-i18n/fcitx ~amd64
@@ -15,7 +14,7 @@ app-i18n/librime ~amd64
 # dev-libs/tree-sitter* ~amd64
 
 # audroid studio
-dev-util/android-studio::gentoo ~amd64
+dev-util/android-studio ~amd64
 
 # frp
 net-vpn/frp ~amd64
@@ -50,3 +49,6 @@ sci-ml/llama-cpp **
 
 # nvidia cuda toolkit
 dev-util/nvidia-cuda-toolkit ~amd64
+
+# proxy
+net-proxy/shadowsocks-rust ~amd64

gentoo_portage/package.license

@@ -22,7 +22,7 @@ net-im/wemeet wemeet_license
 net-misc/anydesk AnyDesk-TOS
 net-misc/baidunetdisk BaiduNetDisk
 net-misc/teamviewer TeamViewer
-sys-kernel/linux-firmware no-source-code linux-fw-redistributable
+sys-kernel/linux-firmware linux-fw-redistributable
 www-client/google-chrome google-chrome
 www-client/microsoft-edge microsoft-edge
 www-plugins/adobe-flash AdobeFlash-11.x

gentoo_portage/package.mask

@@ -1,3 +1,2 @@
 dev-lang/rust
-net-proxy/shadowsocks-rust::gentoo-zh
 >=x11-drivers/nvidia-drivers-581

gentoo_portage/package.use

@@ -18,7 +18,7 @@ x11-terms/rxvt-unicode 256-color blink fading-colors pixbuf unicode3
 #www-servers/uwsgi cgi python
 
 # emacs
-app-editors/emacs cairo dynamic-loading gtk gui gzip-el harfbuzz json libxml2 sound source sqlite tree-sitter wide-int
+app-editors/emacs cairo dynamic-loading -gtk gui gzip-el harfbuzz json libxml2 sound source sqlite tree-sitter wide-int
 app-emacs/emacs-common gui
 
 # 7zip