From f3679d8a1d5127693646f517dafc3a5968ef1eac Mon Sep 17 00:00:00 2001 From: Siina Mashek Date: Tue, 10 May 2022 22:57:45 +0300 Subject: [PATCH] Updating to latest --- kernel.config | 20 +++++++------ make.conf | 9 +++--- package.accept_keywords/bitwarden-desktop-bin | 1 + package.accept_keywords/element-desktop-bin | 1 + package.accept_keywords/gajim | 1 + package.accept_keywords/libuvc | 1 + package.accept_keywords/luxtorpeda | 1 + package.accept_keywords/noisetorch | 1 + package.accept_keywords/parsec | 1 + package.accept_keywords/webcamoid | 1 + package.license | 1 + package.use/ffmpeg | 2 +- package.use/gajim | 1 + package.use/grub | 1 + package.use/libblockdev | 1 - package.use/libsdl2 | 13 --------- package.use/libva | 4 +-- package.use/lv2 | 20 ------------- package.use/obs-studio | 14 --------- package.use/pipewire | 2 +- package.use/plasma-meta | 2 +- package.use/pyqt5 | 4 +++ package.use/python | 2 ++ package.use/steam | 3 ++ package.use/webcamoid | 1 + repos.conf/siina-overlay.conf | 6 ++++ sets/steam | 29 ------------------- 27 files changed, 46 insertions(+), 97 deletions(-) create mode 100644 package.accept_keywords/bitwarden-desktop-bin create mode 100644 package.accept_keywords/element-desktop-bin create mode 100644 package.accept_keywords/gajim create mode 100644 package.accept_keywords/libuvc create mode 100644 package.accept_keywords/luxtorpeda create mode 100644 package.accept_keywords/noisetorch create mode 100644 package.accept_keywords/parsec create mode 100644 package.accept_keywords/webcamoid create mode 100644 package.use/gajim create mode 100644 package.use/grub delete mode 100644 package.use/libblockdev delete mode 100644 package.use/lv2 create mode 100644 package.use/pyqt5 create mode 100644 package.use/webcamoid create mode 100644 repos.conf/siina-overlay.conf delete mode 100644 sets/steam diff --git a/kernel.config b/kernel.config index 7ef0ee9..37ad721 100644 --- a/kernel.config +++ b/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.17.3-gentoo Kernel Configuration +# Linux/x86 5.17.5-gentoo Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Gentoo 11.2.1_p20220115 p4) 11.2.1 20220115" CONFIG_CC_IS_GCC=y @@ -1375,8 +1375,10 @@ CONFIG_NET_FLOW_LIMIT=y CONFIG_BT=y CONFIG_BT_BREDR=y CONFIG_BT_RFCOMM=y -# CONFIG_BT_RFCOMM_TTY is not set -# CONFIG_BT_BNEP is not set +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=y +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=y CONFIG_BT_HS=y CONFIG_BT_LE=y @@ -1912,14 +1914,13 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_ARC is not set CONFIG_NET_VENDOR_ASIX=y # CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_CX_ECAT is not set # CONFIG_NET_VENDOR_BROADCOM is not set -# CONFIG_NET_VENDOR_BROCADE is not set # CONFIG_NET_VENDOR_CADENCE is not set # CONFIG_NET_VENDOR_CAVIUM is not set # CONFIG_NET_VENDOR_CHELSIO is not set # CONFIG_NET_VENDOR_CISCO is not set # CONFIG_NET_VENDOR_CORTINA is not set -# CONFIG_CX_ECAT is not set # CONFIG_DNET is not set # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set @@ -1945,7 +1946,6 @@ CONFIG_IGB_HWMON=y # CONFIG_ICE is not set # CONFIG_FM10K is not set # CONFIG_IGC is not set -# CONFIG_NET_VENDOR_MICROSOFT is not set # CONFIG_JME is not set # CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set @@ -1953,18 +1953,20 @@ CONFIG_IGB_HWMON=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_MICROSEMI is not set +# CONFIG_NET_VENDOR_MICROSOFT is not set # CONFIG_NET_VENDOR_MYRI is not set # CONFIG_FEALNX is not set +# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set -# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set # CONFIG_NET_VENDOR_PENSANDO is not set # CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_BROCADE is not set # CONFIG_NET_VENDOR_QUALCOMM is not set # CONFIG_NET_VENDOR_RDC is not set # CONFIG_NET_VENDOR_REALTEK is not set @@ -1972,9 +1974,9 @@ CONFIG_IGB_HWMON=y # CONFIG_NET_VENDOR_ROCKER is not set # CONFIG_NET_VENDOR_SAMSUNG is not set # CONFIG_NET_VENDOR_SEEQ is not set -# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SILAN is not set # CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set # CONFIG_NET_VENDOR_STMICRO is not set @@ -4460,7 +4462,7 @@ CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA1_SSSE3 is not set # CONFIG_CRYPTO_SHA256_SSSE3 is not set # CONFIG_CRYPTO_SHA512_SSSE3 is not set diff --git a/make.conf b/make.conf index 7e48713..af7aac4 100644 --- a/make.conf +++ b/make.conf @@ -1,8 +1,5 @@ -# These settings were set by the catalyst build script that automatically -# built this stage. -# Please consult /usr/share/portage/config/make.conf.example for a more -# detailed example. -COMMON_FLAGS="-march=znver2 -O2 -pipe" +CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3" +COMMON_FLAGS="-march=znver2 -O2 -pipe -fomit-frame-pointer" CFLAGS="${COMMON_FLAGS}" CXXFLAGS="${COMMON_FLAGS}" FCFLAGS="${COMMON_FLAGS}" @@ -10,7 +7,9 @@ FFLAGS="${COMMON_FLAGS}" ACCEPT_LICENSE="@BINARY-REDISTRIBUTABLE" + # WIP 16-core 32gb +FEATURES="userfetch parallel-fetch parallel-install -ebuild-locks" MAKEOPTS="-j8 --load-average 15.95" EMERGE_DEFAULT_OPTS="--jobs 8 --load-average 15.90" diff --git a/package.accept_keywords/bitwarden-desktop-bin b/package.accept_keywords/bitwarden-desktop-bin new file mode 100644 index 0000000..c1d1e0c --- /dev/null +++ b/package.accept_keywords/bitwarden-desktop-bin @@ -0,0 +1 @@ +app-admin/bitwarden-desktop-bin ~amd64 diff --git a/package.accept_keywords/element-desktop-bin b/package.accept_keywords/element-desktop-bin new file mode 100644 index 0000000..daa4eb6 --- /dev/null +++ b/package.accept_keywords/element-desktop-bin @@ -0,0 +1 @@ +net-im/element-desktop-bin ~amd64 diff --git a/package.accept_keywords/gajim b/package.accept_keywords/gajim new file mode 100644 index 0000000..bc6e064 --- /dev/null +++ b/package.accept_keywords/gajim @@ -0,0 +1 @@ +net-im/gajim ~amd64 diff --git a/package.accept_keywords/libuvc b/package.accept_keywords/libuvc new file mode 100644 index 0000000..53134d3 --- /dev/null +++ b/package.accept_keywords/libuvc @@ -0,0 +1 @@ +media-libs/libuvc ~amd64 diff --git a/package.accept_keywords/luxtorpeda b/package.accept_keywords/luxtorpeda new file mode 100644 index 0000000..9f3c0c0 --- /dev/null +++ b/package.accept_keywords/luxtorpeda @@ -0,0 +1 @@ +games-engines/luxtorpeda ~amd64 diff --git a/package.accept_keywords/noisetorch b/package.accept_keywords/noisetorch new file mode 100644 index 0000000..ca60c2d --- /dev/null +++ b/package.accept_keywords/noisetorch @@ -0,0 +1 @@ +media-sound/noisetorch ~amd64 diff --git a/package.accept_keywords/parsec b/package.accept_keywords/parsec new file mode 100644 index 0000000..aa57285 --- /dev/null +++ b/package.accept_keywords/parsec @@ -0,0 +1 @@ +games-util/parsec::siina ~amd64 diff --git a/package.accept_keywords/webcamoid b/package.accept_keywords/webcamoid new file mode 100644 index 0000000..690b39e --- /dev/null +++ b/package.accept_keywords/webcamoid @@ -0,0 +1 @@ +media-video/webcamoid ~amd64 diff --git a/package.license b/package.license index 647445c..938b3d9 100644 --- a/package.license +++ b/package.license @@ -1,3 +1,4 @@ games-util/steam-launcher::steam-overlay ValveSteamLicense net-im/discord-bin all-rights-reserved www-client/microsoft-edge microsoft-edge +games-util/parsec::siina Parsec-EULA diff --git a/package.use/ffmpeg b/package.use/ffmpeg index 3a8acac..3502f2d 100644 --- a/package.use/ffmpeg +++ b/package.use/ffmpeg @@ -1 +1 @@ -media-video/ffmpeg opus theora vaapi vpx webp x265 +media-video/ffmpeg openh264 opus theora vaapi vpx webp x265 diff --git a/package.use/gajim b/package.use/gajim new file mode 100644 index 0000000..230d41b --- /dev/null +++ b/package.use/gajim @@ -0,0 +1 @@ +net-im/gajim omemo diff --git a/package.use/grub b/package.use/grub new file mode 100644 index 0000000..ab92ea7 --- /dev/null +++ b/package.use/grub @@ -0,0 +1 @@ +sys-boot/grub mount diff --git a/package.use/libblockdev b/package.use/libblockdev deleted file mode 100644 index d4f8444..0000000 --- a/package.use/libblockdev +++ /dev/null @@ -1 +0,0 @@ -sys-libs/libblockdev python_single_target_python3_9 diff --git a/package.use/libsdl2 b/package.use/libsdl2 index e96b53c..e610ba8 100644 --- a/package.use/libsdl2 +++ b/package.use/libsdl2 @@ -1,14 +1 @@ media-libs/libsdl2 gles2 -# required by media-libs/libsdl2-2.0.16-r1::gentoo[pipewire] -# required by app-emulation/wine-vanilla-7.4::gentoo[sdl] -# required by virtual/wine-0-r7::gentoo -# required by @selected -# required by @world (argument) ->=media-video/pipewire-0.3.48-r1 abi_x86_32 -# required by media-libs/libsdl2-2.0.16-r1::gentoo[wayland] -# required by app-emulation/wine-vanilla-7.4::gentoo[sdl] -# required by virtual/wine-0-r7::gentoo -# required by @selected -# required by @world (argument) ->=x11-libs/libxkbcommon-1.3.1 abi_x86_32 - diff --git a/package.use/libva b/package.use/libva index 2484b67..ce37381 100644 --- a/package.use/libva +++ b/package.use/libva @@ -1,3 +1 @@ -# required by media-libs/mesa-21.3.3::gentoo[vaapi,gallium] -# required by mesa (argument) ->=x11-libs/libva-2.13.0-r1 abi_x86_32 opengl +>=x11-libs/libva-2.13.0-r1 opengl abi_x86_32 diff --git a/package.use/lv2 b/package.use/lv2 deleted file mode 100644 index 0e0af5c..0000000 --- a/package.use/lv2 +++ /dev/null @@ -1,20 +0,0 @@ -media-libs/lv2 plugins python_single_target_python3_9 -# required by media-libs/lv2-1.18.2::gentoo[python_single_target_python3_9] -# required by media-libs/sratom-0.6.8::gentoo -# required by media-libs/lilv-0.24.12::gentoo -# required by media-video/pipewire-0.3.50-r3::gentoo[lv2] -# required by kde-plasma/plasma-pa-5.24.4::gentoo -# required by kde-plasma/plasma-meta-5.24.4::gentoo[pulseaudio] -# required by @selected -# required by @world (argument) ->=dev-python/rdflib-6.1.1 python_targets_python3_9 -# required by dev-python/rdflib-6.1.1::gentoo -# required by media-libs/lv2-1.18.2::gentoo[python_single_target_python3_9] -# required by media-libs/sratom-0.6.8::gentoo -# required by media-libs/lilv-0.24.12::gentoo -# required by media-video/pipewire-0.3.50-r3::gentoo[lv2] -# required by kde-plasma/plasma-pa-5.24.4::gentoo -# required by kde-plasma/plasma-meta-5.24.4::gentoo[pulseaudio] -# required by @selected -# required by @world (argument) ->=dev-python/isodate-0.6.1 python_targets_python3_9 diff --git a/package.use/obs-studio b/package.use/obs-studio index 5be97c0..cd66e1d 100644 --- a/package.use/obs-studio +++ b/package.use/obs-studio @@ -1,15 +1 @@ media-video/obs-studio browser pipewire -# required by x11-libs/libXdmcp-1.1.3-r1::gentoo -# required by x11-libs/libxcb-1.14::gentoo -# required by media-video/obs-studio-27.2.0::gentoo -# required by @selected -# required by @world (argument) ->=dev-libs/libbsd-0.11.3 abi_x86_32 -# required by dev-libs/libbsd-0.11.3::gentoo -# required by x11-libs/libXdmcp-1.1.3-r1::gentoo -# required by x11-libs/libxcb-1.14::gentoo -# required by media-video/obs-studio-27.2.0::gentoo -# required by @selected -# required by @world (argument) ->=app-crypt/libmd-1.0.4 abi_x86_32 - diff --git a/package.use/pipewire b/package.use/pipewire index 133bbcf..fe17d20 100644 --- a/package.use/pipewire +++ b/package.use/pipewire @@ -1 +1 @@ -media-video/pipewire extra jack-sdk lv2 +media-video/pipewire extra jack-sdk lv2 abi_x86_32 diff --git a/package.use/plasma-meta b/package.use/plasma-meta index e3bf17f..e3c126e 100644 --- a/package.use/plasma-meta +++ b/package.use/plasma-meta @@ -1 +1 @@ -kde-plasma/plasma-meta -crypt -vault -wallpapers +kde-plasma/plasma-meta -browser-integration -crypt -vault -wallpapers diff --git a/package.use/pyqt5 b/package.use/pyqt5 new file mode 100644 index 0000000..4440a41 --- /dev/null +++ b/package.use/pyqt5 @@ -0,0 +1,4 @@ +# required by www-client/qutebrowser-2.5.0::gentoo[python_single_target_python3_10] +# required by qutebrowser (argument) +>=dev-python/PyQt5-5.15.4-r1 sql + diff --git a/package.use/python b/package.use/python index ba38145..93fb6fa 100644 --- a/package.use/python +++ b/package.use/python @@ -1,2 +1,4 @@ */* PYTHON_TARGETS: -* python3_10 */* PYTHON_SINGLE_TARGET: -* python3_10 + +dev-lang/python tk diff --git a/package.use/steam b/package.use/steam index c1b3d8a..79748e1 100644 --- a/package.use/steam +++ b/package.use/steam @@ -28,3 +28,6 @@ virtual/libelf abi_x86_32 dev-libs/elfutils abi_x86_32 app-arch/bzip2 abi_x86_32 media-libs/vulkan-loader abi_x86_32 +dev-libs/libbsd abi_x86_32 +app-crypt/libmd abi_x86_32 + diff --git a/package.use/webcamoid b/package.use/webcamoid new file mode 100644 index 0000000..ab5a45e --- /dev/null +++ b/package.use/webcamoid @@ -0,0 +1 @@ +media-video/webcamoid libuvc v4lutils diff --git a/repos.conf/siina-overlay.conf b/repos.conf/siina-overlay.conf new file mode 100644 index 0000000..0db7eaa --- /dev/null +++ b/repos.conf/siina-overlay.conf @@ -0,0 +1,6 @@ +[siina] +location = /var/db/repos/siina-overlay +sync-type = git +sync-uri = https://codeberg.org/siina/siina-overlay +auto-sync = yes + diff --git a/sets/steam b/sets/steam deleted file mode 100644 index 58e9d8f..0000000 --- a/sets/steam +++ /dev/null @@ -1,29 +0,0 @@ -app-arch/bzip2 -app-arch/zstd -dev-libs/expat -dev-libs/libffi -dev-libs/libxml2 -dev-libs/icu -dev-libs/wayland -media-libs/libglvnd -media-libs/mesa -sys-devel/llvm -sys-libs/ncurses -sys-libs/zlib -virtual/libelf -virtual/opengl -x11-base/xcb-proto -x11-libs/libdrm -x11-libs/libxshmfence -x11-libs/libX11 -x11-libs/libXau -x11-libs/libXdamage -x11-libs/libXext -x11-libs/libXxf86vm -x11-libs/libXfixes -x11-libs/libXrandr -x11-libs/libXrender -x11-libs/libxcb -x11-libs/libXdmcp - -games-util/steam-meta::steam-overlay