Merge pull request #1895 from pentoo/new_python

new python
pentoo · May 13, 2024 · a6a3775 · a6a3775
2 parents ec07511 + 104b90e
commit a6a3775
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 30 deletions.
diff --git a/profiles/pentoo/arch/amd64/make.defaults b/profiles/pentoo/arch/amd64/make.defaults
@@ -6,8 +6,6 @@ FCFLAGS="${CFLAGS}"
 QEMU_SOFTMMU_TARGETS="arm aarch64 i386 x86_64"
 QEMU_USER_TARGETS="arm aarch64 i386 x86_64"
 
-UNICORN_TARGETS="arm aarch64 x86"
-
 #keystone target
 LLVM_TARGETS="X86"
 

diff --git a/profiles/pentoo/arch/x86/make.defaults b/profiles/pentoo/arch/x86/make.defaults
@@ -3,13 +3,11 @@ CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
-USE="${USE} sse sse2 mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx cpu_flags_x86_mmxext"
+USE="${USE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx cpu_flags_x86_mmxext"
 
 QEMU_SOFTMMU_TARGETS="arm i386"
 QEMU_USER_TARGETS="arm i386"
 
-UNICORN_TARGETS="arm aarch64 x86"
-
 #keystone target
 LLVM_TARGETS="X86"
 

diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults
@@ -33,7 +33,6 @@ XFCE_PLUGINS="${XFCE_PLUGINS} brightness menu logout trash"
 
 #libinput replaces evdev, synaptics AND tslib; gentoo defaults keyboard and mouse have been deprecated for years, so drop them
 INPUT_DEVICES="libinput"
-INPUT_USE="-input_devices_keyboard -input_devices_mouse"
 
 # Log eqawarn messages
 PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"
@@ -42,10 +41,13 @@ PORTAGE_NICENESS="9"
 PORTAGE_IO_NICENESS="ionice -c 3 -p \${PID}"
 
 #tslib causes circular deps with libsdl2
-USE="${USE} ${INPUT_USE} X abi_x86_32 adns blake2 caps -consolekit curl elogind fbcon gles2 gps lm-sensors lm_sensors lto lua lvm lz4 lzip lzma lzo modules-sign networkmanager oss pentoo-full perl pgo pulseaudio python ruby samba sqlite verify-sig vdpau vaapi vulkan wayland xattr xinerama x265 zstd"
+USE="${USE} X abi_x86_32 adns caps curl elogind fbcon gles2 gps lm-sensors lto lua lz4 lzip lzma lzo modules-sign networkmanager oss pentoo-full perl pulseaudio python ruby samba sqlite verify-sig vdpau vaapi vulkan wayland xattr xinerama zstd"
 
+#remove 2024-06-13
 USE="${USE} python_targets_python3_11"
 
+USE="${USE} python_targets_python3_12"
+
 BOOTSTRAP_USE="${BOOTSTRAP_USE} cet http2 lto openmp"
 
 PORTAGE_BZIP2_COMMAND="lbzip2"
@@ -55,9 +57,6 @@ BINPKG_FORMAT="gpkg"
 BINPKG_COMPRESS="zstd"
 BINPKG_COMPRESS_FLAGS="-c -T0 -19"
 
-# Env vars to expand into USE vars
-USE_EXPAND="${USE_EXPAND} COMPAT_DRIVERS_WIFI COMPAT_DRIVERS_ETHERNET COMPAT_DRIVERS_VARIOUS UNICORN_TARGETS"
-
 #mgorny suggested this speeds up sync, in my testing it makes a rather large difference
 PORTAGE_RSYNC_EXTRA_OPTS="--omit-dir-times"
 

diff --git a/profiles/pentoo/base/package.keywords/dev-util b/profiles/pentoo/base/package.keywords/dev-util
@@ -1,2 +1,3 @@
 dev-util/android-sdk-update-manager amd64 x86
+=dev-util/rizin-0.7* amd64 x86
 ~dev-util/systemtap-4.8 amd64 x86
diff --git a/profiles/pentoo/base/package.use/app-arch b/profiles/pentoo/base/package.use/app-arch
@@ -0,0 +1,2 @@
+app-arch/libarchive blake2
+app-arch/xz-utils pgo
diff --git a/profiles/pentoo/base/package.use/app-emulation b/profiles/pentoo/base/package.use/app-emulation
@@ -1,5 +1,6 @@
 app-emulation/libvirt fuse lvm lxc nfs numa parted pcap python qemu uml virt-network
 app-emulation/libvirt-glib python
-app-emulation/qemu lzo mixemu nfs numa smartcard spice ssh systemtap usbredir vde virgl virtfs
+app-emulation/qemu lzo mixemu nfs numa pipewire smartcard spice ssh systemtap usbredir vde virgl virtfs
 app-emulation/wine-vanilla -oss -realtime
 app-emulation/virt-manager spice
+app-emulation/virtualbox lvm
diff --git a/profiles/pentoo/base/package.use/media-libs b/profiles/pentoo/base/package.use/media-libs
@@ -4,7 +4,7 @@ media-libs/gst-plugins-base theora
 media-libs/imlib2 gif
 media-libs/libcaca -ruby
 media-libs/libcanberra gstreamer
-media-libs/libsdl2 haptic
+media-libs/libsdl2 haptic pipewire
 media-libs/libshout speex theora
 media-libs/libvpx postproc svc
 media-libs/lsp-plugins ladspa

diff --git a/profiles/pentoo/base/package.use/media-plugins b/profiles/pentoo/base/package.use/media-plugins
@@ -1,3 +1,3 @@
-media-plugins/audacious-plugins wavpack -gtk -libnotify
+media-plugins/audacious-plugins pipewire wavpack -gtk -libnotify
 media-plugins/calf lv2
 media-plugins/gst-plugins-meta dvd mpeg wavpack
diff --git a/profiles/pentoo/base/package.use/media-video b/profiles/pentoo/base/package.use/media-video
@@ -1,9 +1,9 @@
 media-video/vlc aalib bluray chromecast cdda cddb dvb dvd fontconfig ffmpeg libcaca mpeg mad mtp sid wxwindows aac dts a52 ogg opus flac theora oggvorbis matroska freetype xv stream httpd lua vcd cdio live x265 rtsp v4l speex postproc shout microdns dav1d -vaapi
 virtual/ffmpeg fdk gsm speex threads theora
-media-video/ffmpeg chromium speex threads gsm opus xvid theora openssl
+media-video/ffmpeg chromium speex threads gsm opus xvid theora openssl x265
 media-video/libav speex threads gsm v4l theora
-media-video/mpv libmpv
-media-video/obs-studio imagemagick luajit -python speex v4l vlc
+media-video/mpv libmpv pipewire
+media-video/obs-studio imagemagick luajit pipewire -python speex v4l vlc
 media-video/pipewire echo-cancel extra lv2 v4l
 
 #required by mps-youtube

diff --git a/profiles/pentoo/base/package.use/sys-devel b/profiles/pentoo/base/package.use/sys-devel
@@ -1,5 +1,5 @@
-sys-devel/binutils multitarget
-sys-devel/gcc fortran
+sys-devel/binutils multitarget pgo
+sys-devel/gcc fortran pgo
 sys-devel/llvm clang
 
 # required by net-analyzer/tcpreplay-4.0.4

diff --git a/profiles/pentoo/base/package.use/sys-fs b/profiles/pentoo/base/package.use/sys-fs
@@ -1,5 +1,7 @@
 sys-fs/cryptsetup pwquality reencrypt
 sys-fs/dd-rescue lzo
+sys-fs/lvm2 lvm
 sys-fs/squashfs-tools zstd
 sys-fs/udev hwdb gudev action_modeswitch keymap
+sys-fs/udisks lvm
 sys-fs/quota rpc
diff --git a/profiles/pentoo/base/package.use/sys-kernel b/profiles/pentoo/base/package.use/sys-kernel
@@ -1,2 +1,2 @@
 sys-kernel/genkernel crypt cryptsetup
-sys-kernel/linux-firmware compress-zstd initramfs
+sys-kernel/linux-firmware compress-zstd deduplicate initramfs
diff --git a/profiles/pentoo/base/package.use/sys-libs b/profiles/pentoo/base/package.use/sys-libs
@@ -1,4 +1,5 @@
 sys-libs/binutils-libs multitarget
+sys-libs/libblockdev lvm
 sys-libs/libcxx -unwind
 sys-libs/libcxxapi -unwind
 sys-libs/libunwind -static-libs

diff --git a/profiles/pentoo/base/package.use/www-client b/profiles/pentoo/base/package.use/www-client
@@ -1,2 +1,2 @@
 #libaom builds for me but not in catalyst
-www-client/firefox -system-av1
+www-client/firefox pgo -system-av1
diff --git a/profiles/pentoo/overlay/make.defaults b/profiles/pentoo/overlay/make.defaults
@@ -1,7 +1,3 @@
-# Copyright 2004-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
 # This will help developers track packages, that don't respect LDFLAGS, down
 # more effectively
 LDFLAGS="${LDFLAGS} -Wl,--defsym=__gentoo_check_ldflags__=0"
@@ -29,10 +25,5 @@ XFCE_PLUGINS="${XFCE_PLUGINS} brightness menu logout trash"
 
 USE="${USE} xinerama"
 
-#GRUB_PLATFORMS="coreboot efi-32 efi-64 emu multiboot pc qemu"
-
-# Env vars to expand into USE vars
-USE_EXPAND="${USE_EXPAND} COMPAT_DRIVERS_WIFI COMPAT_DRIVERS_ETHERNET COMPAT_DRIVERS_VARIOUS UNICORN_TARGETS"
-
 #mgorny suggested this speeds up sync, in my testing it makes a rather large difference
 PORTAGE_RSYNC_EXTRA_OPTS="--omit-dir-times"
diff --git a/profiles/pentoo/overlay/package.use/app-arch b/profiles/pentoo/overlay/package.use/app-arch
@@ -0,0 +1 @@
+../../base/package.use/app-arch
diff --git a/profiles/pentoo/zero-system/make.defaults b/profiles/pentoo/zero-system/make.defaults
@@ -1,7 +1,7 @@
 ACCEPT_LICENSE="${ACCEPT_LICENSE} NVIDIA-CUDA android google-chrome Google-TOS baudline Intel-SDP Nero-AAC-EULA ms-teams-pre PUEL PUEL-11"
 
 USE="pentoo-extra zsh-completion -semantic-desktop"
-USE="${USE} python_targets_python3_12"
+#USE="${USE} -python_targets_python3_11"
 
 PORTAGE_GPG_DIR="/home/zero/.gnupg/"
 PORTAGE_GPG_KEY="0xA5DD1427DD11F94A"

diff --git a/scripts/git_local_prune b/scripts/git_local_prune
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		app-arch/libarchive blake2
		app-arch/xz-utils pgo