From 31f94fc8ea28a43f6ccad54f9abaa4c99775cf5a Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Tue, 7 Jan 2020 02:09:24 +0800 Subject: [PATCH] update gentoo portage config --- gentoo_portage/ccache.conf | 5 ++++ gentoo_portage/make.conf | 15 ++++++---- gentoo_portage/package.keywords | 3 +- gentoo_portage/package.license | 7 ++++- gentoo_portage/package.use | 51 ++++++++++++++++++++++----------- gentoo_portage/repos.conf | 27 ++++++++--------- 6 files changed, 71 insertions(+), 37 deletions(-) create mode 100644 gentoo_portage/ccache.conf diff --git a/gentoo_portage/ccache.conf b/gentoo_portage/ccache.conf new file mode 100644 index 0000000..e3541b7 --- /dev/null +++ b/gentoo_portage/ccache.conf @@ -0,0 +1,5 @@ +# Maximum cache size to maintain +max_size = 20.0G + +# Allow others to run 'ebuild' and share the cache. +umask = 002 diff --git a/gentoo_portage/make.conf b/gentoo_portage/make.conf index f8da12b..578ed8b 100644 --- a/gentoo_portage/make.conf +++ b/gentoo_portage/make.conf @@ -18,14 +18,19 @@ PKGDIR="/usr/portage/packages" LC_MESSAGES=C ALSA_CARDS="hda-intel" -GENTOO_MIRRORS="https://mirrors.tuna.tsinghua.edu.cn/gentoo/ -https://mirrors.ustc.edu.cn/gentoo/" +CCACHE_DIR="/var/cache/ccache" +FEATURES="ccache" +GENTOO_MIRRORS=" +https://mirrors.tuna.tsinghua.edu.cn/gentoo/ +https://mirrors.ustc.edu.cn/gentoo/ +http://distfiles.gentoo.org/" GRUB_PLATFORMS="efi-64" -MAKEOPTS="-j9" +MAKEOPTS="-j9 -l8" ACCEPT_KEYWORDS="amd64 ~amd64" INPUT_DEVICES="libinput" RUBY_TARGETS="ruby26" VIDEO_CARDS="fbdev nvidia" -DESKTOP_USE="X alsa apng dbus fbcon ffmpeg fuse gif gtk gtk2 gtk3 jpeg mp3 mp4 mpeg mtp nvidia ogg opengl pdf png svg tiff unicode vaapi vdpau xv xvmc" -USE="${USE} ${DESKTOP_USE} consolekit policykit pulseaudio truetyupe udev xft xcb xkb -bluetooth -cups -gpm -libva -modemmanager" +DESKTOP_USE="X alsa apng dbus fbcon ffmpeg fuse gif gtk gtk2 gtk3 icu jpeg mp3 mp4 mpeg mtp nvidia ogg opengl pdf png svg tiff unicode vaapi vdpau xv xvmc" +#USE="${USE} ${DESKTOP_USE} consolekit policykit pulseaudio truetyupe udev xft xcb xkb -bluetooth -cups -gpm -libva -modemmanager" +USE="${USE} ${DESKTOP_USE} consolekit policykit truetyupe udev xft xcb xkb -bluetooth -cups -gpm -libva -modemmanager" diff --git a/gentoo_portage/package.keywords b/gentoo_portage/package.keywords index a3e94b3..3f709df 100644 --- a/gentoo_portage/package.keywords +++ b/gentoo_portage/package.keywords @@ -1 +1,2 @@ -#app-editors/emacs-vcs ** \ No newline at end of file +app-editors/emacs ** +dev-util/android-studio -~amd64 diff --git a/gentoo_portage/package.license b/gentoo_portage/package.license index 20aaad9..ad590bc 100644 --- a/gentoo_portage/package.license +++ b/gentoo_portage/package.license @@ -1,4 +1,9 @@ -app-arch/rar RAR app-emulation/virtualbox-bin PUEL +dev-db/mongodb SSPL-1 +net-misc/teamviewer TeamViewer www-client/google-chrome google-chrome www-plugins/adobe-flash AdobeFlash-11.x + +app-arch/p7zip unRAR +x11-drivers/nvidia-drivers NVIDIA-r2 +sys-kernel/linux-firmware no-source-code linux-fw-redistributable diff --git a/gentoo_portage/package.use b/gentoo_portage/package.use index 36bae6a..a7c6f71 100644 --- a/gentoo_portage/package.use +++ b/gentoo_portage/package.use @@ -1,37 +1,47 @@ # abi -x11-libs/libX11 abi_x86_32 -x11-libs/libXext abi_x86_32 -x11-libs/libvdpau abi_x86_32 -sys-libs/zlib abi_x86_32 -x11-libs/libxcb abi_x86_32 -dev-libs/libpthread-stubs abi_x86_32 -x11-libs/libXau abi_x86_32 -x11-libs/libXdmcp abi_x86_32 -x11-base/xcb-proto abi_x86_32 +# dev-libs/glib abi_x86_32 +# dev-libs/libffi abi_x86_32 +# dev-libs/libpcre abi_x86_32 +# dev-libs/libpthread-stubs abi_x86_32 +# dev-util/pkgconfig abi_x86_32 +# sys-apps/attr abi_x86_32 +# sys-apps/util-linux abi_x86_32 +# sys-libs/zlib abi_x86_32 +# virtual/libffi abi_x86_32 +# virtual/libiconv abi_x86_32 +# virtual/libintl abi_x86_32 +# virtual/pkgconfig abi_x86_32 +# x11-libs/libX11 abi_x86_32 +# x11-libs/libXau abi_x86_32 +# x11-libs/libXdmcp abi_x86_32 +# x11-libs/libXext abi_x86_32 +# x11-libs/libvdpau abi_x86_32 +# x11-libs/libxcb abi_x86_32 +# x11-base/xcb-proto abi_x86_32 app-text/xmlto text dev-lang/python sqlite +dev-libs/gmp static-libs dev-libs/libpcre2 pcre16 media-libs/mesa -vaapi -gallium net-misc/openssh libedit sys-apps/util-linux static-libs sys-boot/grub mount +#sys-devel/binutils gold default-gold -# network -app-crypt/pinentry gnome-keyring -gnome-extra/nm-applet -modemmanager -net-misc/networknamager connection-sharing -modemmanager -net-wireless/wpa_supplicant ap +# nvidia driver +x11-drivers/nvidia-drivers -abi_x86_32 # terminal +x11-terms/xterm sixel truetype xinerama x11-terms/rxvt-unicode 256-color blink fading-colors pixbuf unicode3 # uswgi #www-servers/uwsgi cgi python # emacs -app-editors/emacs dynamic-loading gfile gsettings gzip-el imagemagick libxml2 m17n-lib sound source wide-int -app-editors/emacs-vcs dynamic-loading gfile gsettings gzip-el imagemagick libxml2 m17n-lib sound source wide-int +app-editors/emacs dynamic-loading gfile gsettings gzip-el imagemagick json libxml2 m17n-lib sound source wide-int +app-editors/emacs-vcs cairo dynamic-loading gfile gsettings gzip-el harfbuzz imagemagick json libxml2 m17n-lib sound source wide-int # p7zip app-arch/p7zip rar -wxwidgets @@ -51,4 +61,11 @@ dev-ml/lablgl glut sys-libs/ncurses:5 tinfo # firefox -www-client/firefox -system-libvpx -system-sqlite +www-client/firefox -system-av1 -system-icu -system-jpeg -system-libevent -system-libvpx -system-sqlite -system-webp +www-client/firefox-bin -pulseaudio + +# pdf +app-text/mupdf -opengl + +# postgresql +dev-db/postgresql python diff --git a/gentoo_portage/repos.conf b/gentoo_portage/repos.conf index 3c0b4cc..a73f44c 100644 --- a/gentoo_portage/repos.conf +++ b/gentoo_portage/repos.conf @@ -4,22 +4,23 @@ main-repo = gentoo [gentoo] location = /usr/portage sync-type = rsync -#sync-uri = rsync://rsync.gentoo.org/gentoo-portage +# sync-uri = rsync://rsync.gentoo.org/gentoo-portage sync-uri = rsync://mirrors.tuna.tsinghua.edu.cn/gentoo-portage -#sync-uri = rsync://rsync.mirrors.ustc.edu.cn/gentoo-portage +# sync-uri = rsync://rsync.mirrors.ustc.edu.cn/gentoo-portage/ auto-sync = yes +sync-rsync-verify-jobs = 1 +# 拉取 gpg 密钥很慢，关闭之 sync-rsync-verify-metamanifest = no -sync-openpgp-key-path = /var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg - -#[czh-private] -#location = /usr/local/portage/czh-private - -#[gentoo-zh] -#location = /usr/local/portage/gentoo-zh -#sync-type = git -#sync-uri = git://github.com/microcai/gentoo-zh.git -#auto-sync = yes +sync-rsync-verify-max-age = 24 +sync-openpgp-key-path = /usr/share/openpgp-keys/gentoo-release.asc +sync-openpgp-keyserver = hkps://keys.gentoo.org +sync-openpgp-key-refresh-retry-count = 40 +sync-openpgp-key-refresh-retry-overall-timeout = 1200 +sync-openpgp-key-refresh-retry-delay-exp-base = 2 +sync-openpgp-key-refresh-retry-delay-max = 60 +sync-openpgp-key-refresh-retry-delay-mult = 4 +sync-webrsync-verify-signature = yes # for daily squashfs snapshots #sync-type = squashdelta -#sync-uri = mirror://gentoo/../snapshots/squashfs \ No newline at end of file +#sync-uri = mirror://gentoo/../snapshots/squashfs