work on new 2022 release, drop old ruby and python

3 files changed, 13 insertions, 227 deletions

diff --git a/gentoox_build.sh b/gentoox_build.sh
index 99a74ee..73b5534 100755
--- a/gentoox_build.sh
+++ b/gentoox_build.sh
@@ -144,7 +144,7 @@ PORTDIR="/var/db/repos/gentoo"
 DISTDIR="/var/cache/distfiles"
 PKGDIR="/var/cache/binpkgs"
 LC_MESSAGES=C
-RUBY_TARGETS="ruby27 ruby30"' > /etc/portage/make.conf
+RUBY_TARGETS="ruby31"' > /etc/portage/make.conf
 
 mkdir /etc/portage/env
 echo 'CFLAGS="\${CFLAGS} -fno-lto"
@@ -193,14 +193,8 @@ dev-libs/libdbusmenu gtk3
 net-misc/curl http2
 dev-libs/apr-util ldap
 sys-apps/util-linux caps
-*/* PYTHON_TARGETS: python2_7 python3_10
-*/* PYTHON_SINGLE_TARGET: -* python3_10
-app-misc/lirc python_single_target_python3_9
-media-gfx/blender python_single_target_python3_9
-dev-libs/libnatspec python_single_target_python2_7
-dev-lang/yasm python_single_target_python2_7
-media-libs/libcaca python_single_target_python2_7
-gnome-base/libglade python_single_target_python2_7' > /etc/portage/package.use/gentoox
+*/* PYTHON_TARGETS: -* python3_10
+*/* PYTHON_SINGLE_TARGET: -* python3_10' > /etc/portage/package.use/gentoox
 
 rm -rf /etc/portage/package.accept_keywords/
 echo -n > /etc/portage/package.accept_keywords
@@ -427,6 +421,9 @@ FEATURES="-userpriv" emerge dev-lang/yasm  # yasm fails to build otherwise
 #echo 'sys-kernel/genkernel-next plymouth
 #sys-boot/plymouth gdm' > /etc/portage/package.use/gentoox
 
+echo 'media-video/pipewire *FLAGS-="${SEMINTERPOS}"  # https://github.com/InBetweenNames/gentooLTO/issues/796
+media-gfx/blender *FLAGS+=-ffat-lto-objects    # https://github.com/InBetweenNames/gentooLTO/pull/788' > /etc/portage/package.cflags/gentoox.conf
+
 emerge -v --autounmask=y --autounmask-write=y --keep-going=y --deep --newuse xorg-server nvidia-firmware arandr elogind sudo vim weston wpa_supplicant ntp bind-tools telnet-bsd snapper \
 nfs-utils cifs-utils samba dhcpcd nss-mdns zsh zsh-completions powertop cpupower lm-sensors screenfetch gparted gdb strace atop dos2unix app-misc/screen app-text/tree openbsd-netcat laptop-mode-tools hdparm alsa-utils vulkan-tools mesa-progs tcpdump shim mokutil #plymouth-openrc-plugin
 #emerge -avuDN --with-bdeps=y @world
@@ -467,7 +464,9 @@ dev-qt/qtmultimedia gstreamer
 media-libs/gd avif heif
 media-libs/libvpx postproc
 gnome-base/gvfs afp archive bluray fuse gphoto2 ios mtp nfs samba zeroconf
-net-irc/telepathy-idle python_single_target_python2_7' >> /etc/portage/package.use/gentoox
+net-irc/telepathy-idle python_single_target_python2_7
+kde-frameworks/* speech
+kde-apps/* speech' >> /etc/portage/package.use/gentoox
 
 # enable flatpak backend in discover, patch qt-creator to use clang9 effectively dropping clang8
 echo 'kde-plasma/discover flatpak' >> /etc/portage/package.use/gentoox
@@ -550,7 +549,8 @@ x11-libs/libXxf86vm abi_x86_32
 media-libs/libglvnd abi_x86_32
 virtual/opencl abi_x86_32
 app-arch/zstd abi_x86_32
-dev-util/wayland-scanner abi_x86_32' >> /etc/portage/package.use/gentoox
+dev-util/wayland-scanner abi_x86_32
+sys-apps/systemd-utils abi_x86_32' >> /etc/portage/package.use/gentoox
 emerge -v steam-meta
 touch /tmp/gentoox-steam-done
 HEREDOC
@@ -819,7 +819,8 @@ export CLUTTER_BACKEND=wayland
 export COGL_RENDERER=egl_wayland
 export SDL_VIDEODRIVER=wayland
 export QT_QPA_PLATFORM=wayland-egl
-exec weston-launch' > weston-launch.sh
+export MOZ_ENABLE_WAYLAND=1
+exec weston' > weston-launch.sh
   chmod +x weston-launch.sh
 fi
 
diff --git a/patches/media-libs/osl/8682211d0bfe5c4be63a4a003d06037ff9721e66.patch b/patches/media-libs/osl/8682211d0bfe5c4be63a4a003d06037ff9721e66.patch
deleted file mode 100644
index 34adf4c..0000000
--- a/patches/media-libs/osl/8682211d0bfe5c4be63a4a003d06037ff9721e66.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 8682211d0bfe5c4be63a4a003d06037ff9721e66 Mon Sep 17 00:00:00 2001
-From: Luya Tshimbalanga <luya@fedoraproject.org>
-Date: Tue, 28 Sep 2021 10:08:01 -0700
-Subject: [PATCH] Fix compatibility with LLVM 12 and up (#1412)
-
-Upstream LLVM stopped using the compatibility
-spellings of OF_{None,Text,Append} from version 12 and up.
-
-https://reviews.llvm.org/D101650
-
-Signed-off-by: Luya Tshimbalanga <luya@fedoraproject.org>
----
- src/liboslexec/llvm_util.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 4bd0dca35..4d0e1752d 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -1407,7 +1407,9 @@ LLVM_Util::make_jit_execengine (std::string *err,
- 
-     options.NoZerosInBSS = false;
-     options.GuaranteedTailCallOpt = false;
-+#if OSL_LLVM_VERSION < 120
-     options.StackAlignmentOverride = 0;
-+#endif
-     options.FunctionSections = true;
-     options.UseInitArray = false;
-     options.FloatABIType = llvm::FloatABI::Default;
-@@ -5385,7 +5387,7 @@ void
- LLVM_Util::write_bitcode_file (const char *filename, std::string *err)
- {
-     std::error_code local_error;
--    llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::F_None);
-+    llvm::raw_fd_ostream out (filename, local_error, llvm::sys::fs::OF_None);
-     if (! out.has_error()) {
-         llvm::WriteBitcodeToFile (*module(), out);
-         if (err && local_error)
-@@ -5447,7 +5449,9 @@ LLVM_Util::ptx_compile_group (llvm::Module* lib_module, const std::string& name,
-     options.AllowFPOpFusion                        = llvm::FPOpFusion::Fast;
-     options.NoZerosInBSS                           = 0;
-     options.GuaranteedTailCallOpt                  = 0;
-+#if OSL_LLVM_VERSION < 120
-     options.StackAlignmentOverride                 = 0;
-+#endif
-     options.UseInitArray                           = 0;
- 
-     llvm::TargetMachine* target_machine = llvm_target->createTargetMachine(
diff --git a/patches/media-libs/osl/bf02d4a98b284e865cda0422dcd5bef2cdc4d662.patch b/patches/media-libs/osl/bf02d4a98b284e865cda0422dcd5bef2cdc4d662.patch
deleted file mode 100644
index 9407c28..0000000
--- a/patches/media-libs/osl/bf02d4a98b284e865cda0422dcd5bef2cdc4d662.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From bf02d4a98b284e865cda0422dcd5bef2cdc4d662 Mon Sep 17 00:00:00 2001
-From: Larry Gritz <lg@larrygritz.com>
-Date: Sun, 24 Oct 2021 15:29:08 -0700
-Subject: [PATCH] Changes to work with LLVM 13 (#1420)
-
-And a few places to let it compile with clang 13's new warnings.
-
-Signed-off-by: Larry Gritz <lg@larrygritz.com>
----
- src/include/OSL/llvm_util.h        | 17 +++++++++--
- src/liboslexec/llvm_util.cpp       | 45 ++++++++++++++++++++++++++----
- src/liboslexec/runtimeoptimize.cpp |  2 --
- 4 files changed, 62 insertions(+), 18 deletions(-)
-
-diff --git a/src/include/OSL/llvm_util.h b/src/include/OSL/llvm_util.h
-index fbf091d60..95df9632f 100644
---- a/src/include/OSL/llvm_util.h
-+++ b/src/include/OSL/llvm_util.h
-@@ -802,6 +802,9 @@ class OSLEXECPUBLIC LLVM_Util {
-                     llvm::Value *src, int srcalign, int len);
- 
-     /// Dereference a pointer:  return *ptr
-+    /// type is the type of the thing being pointed to.
-+    llvm::Value *op_load (llvm::Type* type, llvm::Value *ptr);
-+    // Blind pointer version that's deprecated as of LLVM13:
-     llvm::Value *op_load (llvm::Value *ptr);
- 
-     llvm::Value *op_gather(llvm::Value *ptr, llvm::Value *index);
-@@ -830,17 +833,25 @@ class OSLEXECPUBLIC LLVM_Util {
- 
-     /// Generate a GEP (get element pointer) where the element index is an
-     /// llvm::Value, which can be generated from either a constant or a
--    /// runtime-computed integer element index.
-+    /// runtime-computed integer element index. `type` is the type of the data
-+    /// we're retrieving.
-+    llvm::Value *GEP (llvm::Type* type, llvm::Value *ptr, llvm::Value *elem);
-+    // Blind pointer version that's deprecated as of LLVM13:
-     llvm::Value *GEP (llvm::Value *ptr, llvm::Value *elem);
- 
-     /// Generate a GEP (get element pointer) with an integer element
--    /// offset.
-+    /// offset. `type` is the type of the data we're retrieving.
-+    llvm::Value *GEP (llvm::Type* type, llvm::Value *ptr, int elem);
-+    // Blind pointer version that's deprecated as of LLVM13:
-     llvm::Value *GEP (llvm::Value *ptr, int elem);
- 
-     /// Generate a GEP (get element pointer) with two integer element
-     /// offsets.  This is just a special (and common) case of GEP where
-     /// we have a 2-level hierarchy and we have fixed element indices
--    /// that are known at compile time.
-+    /// that are known at compile time.  `type` is the type of the data we're
-+    /// retrieving.
-+    llvm::Value *GEP (llvm::Type* type, llvm::Value *ptr, int elem1, int elem2);
-+    // Blind pointer version that's deprecated as of LLVM13:
-     llvm::Value *GEP (llvm::Value *ptr, int elem1, int elem2);
- 
-     // Arithmetic ops.  It auto-detects the type (int vs float).
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 4d0e1752d..a1d31fe4d 100644
---- a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -3595,10 +3595,18 @@ LLVM_Util::op_memcpy (llvm::Value *dst, int dstalign,
- 
- 
- 
-+llvm::Value *
-+LLVM_Util::op_load (llvm::Type* type, llvm::Value* ptr)
-+{
-+    return builder().CreateLoad (type, ptr);
-+}
-+
-+
-+
- llvm::Value *
- LLVM_Util::op_load (llvm::Value *ptr)
- {
--    return builder().CreateLoad (ptr);
-+    return op_load(ptr->getType()->getPointerElementType(), ptr);
- }
- 
- 
-@@ -4883,7 +4891,7 @@ LLVM_Util::op_store (llvm::Value *val, llvm::Value *ptr)
-             // happen and a read+.
-             // TODO: Optimization, if we know this was the final store to
-             // the ptr, we could force a masked store vs. load/blend
--            llvm::Value *previous_value = builder().CreateLoad (ptr);
-+            llvm::Value *previous_value = op_load(ptr);
-             if (false == mi.negate) {
-                 llvm::Value *blended_value = builder().CreateSelect(mi.mask, val, previous_value);
-                 builder().CreateStore(blended_value, ptr);
-@@ -4924,10 +4932,27 @@ LLVM_Util::op_store_mask (llvm::Value *llvm_mask, llvm::Value *native_mask_ptr)
- 
- 
- 
-+llvm::Value *
-+LLVM_Util::GEP (llvm::Type* type, llvm::Value* ptr, llvm::Value* elem)
-+{
-+    return builder().CreateGEP(type, ptr, elem);
-+}
-+
-+
-+
- llvm::Value *
- LLVM_Util::GEP (llvm::Value *ptr, llvm::Value *elem)
- {
--    return builder().CreateGEP (ptr, elem);
-+    return GEP(ptr->getType()->getScalarType()->getPointerElementType(), ptr,
-+               elem);
-+}
-+
-+
-+
-+llvm::Value *
-+LLVM_Util::GEP (llvm::Type* type, llvm::Value* ptr, int elem)
-+{
-+    return builder().CreateConstGEP1_32(type, ptr, elem);
- }
- 
- 
-@@ -4935,7 +4960,16 @@ LLVM_Util::GEP (llvm::Value *ptr, llvm::Value *elem)
- llvm::Value *
- LLVM_Util::GEP (llvm::Value *ptr, int elem)
- {
--    return builder().CreateConstGEP1_32 (ptr, elem);
-+    return GEP(ptr->getType()->getScalarType()->getPointerElementType(), ptr,
-+               elem);
-+}
-+
-+
-+
-+llvm::Value *
-+LLVM_Util::GEP(llvm::Type* type, llvm::Value* ptr, int elem1, int elem2)
-+{
-+    return builder().CreateConstGEP2_32 (type, ptr, elem1, elem2);
- }
- 
- 
-@@ -4943,7 +4977,8 @@ LLVM_Util::GEP (llvm::Value *ptr, int elem)
- llvm::Value *
- LLVM_Util::GEP (llvm::Value *ptr, int elem1, int elem2)
- {
--    return builder().CreateConstGEP2_32 (nullptr, ptr, elem1, elem2);
-+    return GEP(ptr->getType()->getScalarType()->getPointerElementType(), ptr,
-+               elem1, elem2);
- }
- 
- 
-diff --git a/src/liboslexec/runtimeoptimize.cpp b/src/liboslexec/runtimeoptimize.cpp
-index dfe554164..da67c712e 100644
---- a/src/liboslexec/runtimeoptimize.cpp
-+++ b/src/liboslexec/runtimeoptimize.cpp
-@@ -2284,7 +2284,6 @@ RuntimeOptimizer::optimize_instance ()
-     // passes, but we have a hard cutoff just to be sure we don't
-     // ever get into an infinite loop from an unforseen cycle where we
-     // end up inadvertently transforming A => B => A => etc.
--    int totalchanged = 0;
-     int reallydone = 0;   // Force a few passes after we think we're done
-     int npasses = shadingsys().opt_passes();
-     for (m_pass = 0;  m_pass < npasses;  ++m_pass) {
-@@ -2345,7 +2344,6 @@ RuntimeOptimizer::optimize_instance ()
-         // If nothing changed, we're done optimizing.  But wait, it may be
-         // that after re-tracking variable lifetimes, we can notice new
-         // optimizations!  So force another pass, then we're really done.
--        totalchanged += changed;
-         if (changed < 1) {
-             if (++reallydone > 3)
-                 break;