From 97e7a541719dcf6fe117cf866c6a91cec1c8f99f Mon Sep 17 00:00:00 2001
From: Zedhugh Chen <zedhugh@gmail.com>
Date: Wed, 2 Mar 2022 00:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20gentoo=20portage=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gentoo_portage/make.conf   | 11 ++++++-----
 gentoo_portage/package.env |  9 ++++++---
 gentoo_portage/package.use | 16 ++++++++++++++--
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/gentoo_portage/make.conf b/gentoo_portage/make.conf
index 659856e..b9a115c 100644
--- a/gentoo_portage/make.conf
+++ b/gentoo_portage/make.conf
@@ -18,17 +18,18 @@ PKGDIR="/var/cache/binpkgs"
 LC_MESSAGES=C
 
 # buildpkg features
-FEATURES="buildpkg ${FEATURES}"
+# FEATURES="buildpkg ${FEATURES}"
 QUICKPKG_DEFAULT_OPTS="--include-config y"
-EMERGE_DEFAULT_OPTS="--buildpkg --buildpkg-exclude \"virtual/* sys-kernel/*-sources\" ${EMERGE_DEFAULT_OPTS}"
+# EMERGE_DEFAULT_OPTS="--buildpkg --buildpkg-exclude \"virtual/* sys-kernel/*-sources\" ${EMERGE_DEFAULT_OPTS}"
 # PORTAGE_BINHOST="ssh://root@192.168.2.102/var/cache/binpkgs"
 
 # ccache and distcc
-FEATURES="distcc ${FEATURES}"
+# FEATURES="distcc ${FEATURES}"
 
+# ABI_X86="32 64"
 ALSA_CARDS="hda-intel"
 # CCACHE_DIR="/var/cache/ccache"
-# FEATURES="ccache"
+# FEATURES="ccache ${FEATURES}"
 GENTOO_MIRRORS="
 https://mirrors.tuna.tsinghua.edu.cn/gentoo/
 https://mirrors.ustc.edu.cn/gentoo/
@@ -43,7 +44,7 @@ INPUT_DEVICES="libinput"
 # LUA_SINGLE_TARGET="luajit"
 # PYTHON_TARGETS="python3_7 python3_8 python3_9"
 # PYTHON_SINGLE_TARGET="python3_8"
-# RUBY_TARGETS="ruby27"
+RUBY_TARGETS="ruby30"
 VIDEO_CARDS="fbdev nvidia"
 
 DESKTOP_USE="X alsa apng dbus fbcon ffmpeg flac fuse gif gtk gtk2 gtk3 http2 icu jpeg mp3 mp4 mpeg mtp nvidia ogg opengl pdf png svg tiff unicode vaapi vdpau xv xvmc"
diff --git a/gentoo_portage/package.env b/gentoo_portage/package.env
index 27cc212..66afac7 100644
--- a/gentoo_portage/package.env
+++ b/gentoo_portage/package.env
@@ -1,10 +1,13 @@
 app-office/libreoffice  notmpfs.conf
+dev-lang/ghc			notmpfs.conf
+dev-lang/mono			notmpfs.conf
+dev-lang/rust			notmpfs.conf
+dev-lang/spidermonkey   notmpfs.conf
 dev-java/icedtea        notmpfs.conf
-dev-lang/ghc            notmpfs.conf
 mail-client/thunderbird notmpfs.conf
 sys-devel/gcc           notmpfs.conf
 www-client/chromium     notmpfs.conf
 www-client/firefox      notmpfs.conf
 
-sys-libs/glibc valgrind.conf
-sys-devel/clang lessThreads.conf
\ No newline at end of file
+sys-libs/glibc          valgrind.conf
+sys-devel/clang         lessThreads.conf
\ No newline at end of file
diff --git a/gentoo_portage/package.use b/gentoo_portage/package.use
index df6aa33..363aba2 100644
--- a/gentoo_portage/package.use
+++ b/gentoo_portage/package.use
@@ -18,6 +18,8 @@
 # x11-libs/libvdpau abi_x86_32
 # x11-libs/libxcb abi_x86_32
 # x11-base/xcb-proto abi_x86_32
+sys-libs/libxcrypt abi_x86_32
+virtual/libcrypt abi_x86_32
 
 app-text/xmlto text
 dev-lang/python sqlite
@@ -45,7 +47,7 @@ x11-terms/rxvt-unicode 256-color blink fading-colors pixbuf unicode3
 app-editors/emacs cairo dynamic-loading gfile gsettings gui gzip-el harfbuzz json libxml2 m17n-lib sound source wide-int
 # move app-emacs/emacs-common-gentoo app-emacs/emacs-common
 app-emacs/emacs-common gui
-media-libs/freetype harfbuzz
+# media-libs/freetype harfbuzz
 sys-devel/gcc jit
 
 # p7zip
@@ -67,7 +69,9 @@ dev-ml/lablgl glut
 sys-libs/ncurses:5 tinfo
 
 # firefox
-www-client/firefox -system-av1 -system-icu -system-jpeg -system-libevent -system-libvpx -system-sqlite -system-webp
+media-libs/libvpx postproc
+#www-client/firefox -clang
+#www-client/firefox -system-av1 -system-icu -system-jpeg -system-libevent -system-libvpx -system-sqlite -system-webp
 www-client/firefox-bin -pulseaudio
 
 # pdf
@@ -97,6 +101,9 @@ dev-embedded/sdcc device-lib mcs51 packihx
 # MPD/MPC
 media-sound/ncmpcpp clock outputs taglib visualizer
 
+# graphviz
+media-libs/gd fontconfig
+
 # deepin-wine-wechat
 # media-libs/libcanberra pulseaudio
 # media-libs/mesa osmesa -vaapi
@@ -106,3 +113,8 @@ media-sound/ncmpcpp clock outputs taglib visualizer
 
 # dingtalk
 media-plugins/alsa-plugins pulseaudio
+
+# fcitx5
+app-i18n/fcitx5-configtool -kcm
+app-i18n/fcitx5-meta rime -chinese-addons
+app-i18n/fcitx5-qt qt5