gentoo auto-resync : 11:01:2024 - 13:07:07

4 files changed, 10 insertions, 23 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 92ff73be41b7..15f6c14862f6 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 5214917de3b6..d3523c389b51 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -8,10 +8,10 @@ AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d9367338471
 AUX mythtv-33.1-ffmpeg-binutils-2.41.patch 2269 BLAKE2B 54f44ccc8c3901b89c271f634b09d42d0d63c43289e1b4a5a3492cce0f480eb485e345fce0a74a5980c9fa84adb58cd588abb761df1755fa87b4be47fa4642b6 SHA512 6fcf2c2dd38763c0099d62d357c78c4c1c2a5c510a9128e3b5129e27403e47425932dd09f4188485dea86073c770b77ed2fc980fcc37d55176bfb355faf3be65
 AUX mythtv-33.1-libva.patch 3296 BLAKE2B 31e7621b2b373120be1da0ee570a449d4bbfc0ee5d5fbb7c0c13da0afa963800fbe802e9413fd267ea4fb21a5163be1e2d67465078f0267bddc0a9b73e33937b SHA512 122d4f324cdd6be5f611b68f94423c57e5f36ae90141d475e30020bbee2d91f41ebd6cbd8be56ba6d95719d3631d6fd9b3b91a0a7e67401fd2bb66a54a12f97f
 AUX mythtv-33.1-linux-headers-6.5.patch 1190 BLAKE2B 354bb6a2615ea819ab5ed974900aaed0be3593be3c7191aa64a798f86f2f27eb9d599b639e45e9e4c5748b175b2015c030b8e644b1228ced38a697305597de20 SHA512 99a8599833718089d3060bbf9e0c5a4ec58760407b04caa50b95f918556f5a10225fe833d5f641a3058e4c539ecd365789b50cbea5996694f4be41a3d25cc13a
-AUX mythtv-33.1-python3.12.patch 12303 BLAKE2B 5bf5ddbdc78f6515924c6a88040a6f3845d6ccebaabac60f65890a441c24a5b77870cd27b647c49c884a94ae4a0d851ac64964c17a437ecec260b177398067d2 SHA512 831a3f2aacccc34e18dd3aa2df6b6fb963a8a00e0af567e9a641e392108911c81f2c221e3570fbd6b8d1b77968f92262000b92812b0aadc289d9d82f893476a6
+AUX mythtv-33.1-python3.12.patch 11069 BLAKE2B c03b53e15a37cb5236248045f1b8b74b0e942dc3af0b6ffcffb10126779c74c32e2bb94e574c8eebb3d31a136e796ebcc26e40ff36a96669c09840e0954c7081 SHA512 482df453810f6037c30197f80094e1879c4e00473e3d1c55f168af61e59af092a5ec9adf57cbd4371584f9693414a421cb5b723c5988f70beb8d8f0f042c6c6b
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-33.1.tar.gz 116920982 BLAKE2B bc784a12ee0acf3066d46896343ed15a2f7097364595d20e832da3197eb37c8d05342f82171b66ec842ec48b5829b7ace8c6043835b8de4a04afd8a4df72df1d SHA512 4dc2943915e5e3ca047edc0a005a9e0b58edf7bc51c7fb097a6715bbbb52028260065a7f52f35e4ed98559cc4f4ccca76f1cf6ae68e76b1f2d06a1befd4776e9
-EBUILD mythtv-33.1-r1.ebuild 10424 BLAKE2B 2c414622038fedf66ff46131373ecbd11d6f0dd2959b52c37887ce9e8491beb58f1015dfdf5e06af2893402432799e8f9794f0520e98185ad64074e1cdba462a SHA512 9edcb9d47c370e22e1065d613326f5180cb9518e53630523cbb491429f93d3b4204fc66ea9cf0972baf1f226079ee32132881e0989815416f6222531ebb1fb03
+EBUILD mythtv-33.1-r1.ebuild 10436 BLAKE2B 3f4a73c8be274f7e166e232d4dcd8bf5b47d35f2a2fe732bf1196c08d62a91efbd6f77e8806b6b6bf3e72c9f120f9c1446cd122522274d281983387ddc06e23e SHA512 2b088a3ca2973929c6b84a7e447e2c1a52fa3c43cf1c08fc293fc6d0a2fcf40e724c31778d2e3a956db690109232b6b80b91d3d11b95e043348525f51c06bdd0
 EBUILD mythtv-33.1.ebuild 10465 BLAKE2B 34011aac569fd40af49f6be16d43780b67868e2c1f00a1dddcca369d015a372506d454e34e78d213161d5ed4735f94b680046bf8001be8d58b87f0544e8ea43d SHA512 9dee8fd619f58ce480150182d4efaa4c59e230aee10cf8cabcd183dc81c6bac35a607524be30395925065cbd0614aac7f45108a38b3e1e778a56ed83a63e989f
 MISC metadata.xml 1983 BLAKE2B 3aad016c2964bbb51e234c8c4c91fa1945837adb30db1445a593f227eb8d1068c78e218bbdfb26591ce34bf61bcb2967653a009f9306602bcb15faeb9152635e SHA512 f369462e9e7b79c22325b3c95560cab83919c598526cd955963c97d5d3fc7764260d98a4565a9a64251119a8cc656f485a96f326881884132a0c29975319f4d7
diff --git a/media-tv/mythtv/files/mythtv-33.1-python3.12.patch b/media-tv/mythtv/files/mythtv-33.1-python3.12.patch
index 48a97b09623d..91f72ab13ac3 100644
--- a/media-tv/mythtv/files/mythtv-33.1-python3.12.patch
+++ b/media-tv/mythtv/files/mythtv-33.1-python3.12.patch
@@ -1,4 +1,4 @@
-From f1848eb41bf35d57b63b3a8cb19763c5b4656717 Mon Sep 17 00:00:00 2001
+From ea59f869dcbd73b1d0dca973314604f689b50c34 Mon Sep 17 00:00:00 2001
 From: Eli Schwartz <eschwartz93@gmail.com>
 Date: Thu, 4 Jan 2024 16:18:00 -0500
 Subject: [PATCH 1/2] hardwareprofile: remove external dependency on simplejson
@@ -41,24 +41,10 @@ Fixes: 1df343e9ab7defa284a73390210a65cf2112f17e
 Reimplements: bb154a843b737cc3ad8c1a45fa04a1a3609aff05
 (cherry picked from commit 6348dc01a45af6ed63c09326ec94cd425db1d6d7)
 ---
- .github/workflows/buildmaster.yml                | 2 +-
  mythtv/configure                                 | 1 -
  mythtv/programs/scripts/hardwareprofile/smolt.py | 5 ++---
- 3 files changed, 3 insertions(+), 5 deletions(-)
+ 2 files changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/.github/workflows/buildmaster.yml b/.github/workflows/buildmaster.yml
-index eea6e9fc2a..325cc7da64 100644
---- a/.github/workflows/buildmaster.yml
-+++ b/.github/workflows/buildmaster.yml
-@@ -48,7 +48,7 @@ jobs:
-         sudo apt install ccache qt5-qmake qtscript5-dev nasm libsystemd-dev libfreetype6-dev libmp3lame-dev libx264-dev libx265-dev libxrandr-dev libxml2-dev
-         sudo apt install libavahi-compat-libdnssd-dev libasound2-dev liblzo2-dev libhdhomerun-dev libsamplerate0-dev libva-dev libdrm-dev libvdpau-dev
-         sudo apt install libass-dev libpulse-dev libcec-dev libssl-dev libtag1-dev libbluray-dev libbluray-bdj libgnutls28-dev libqt5webkit5-dev
--        sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-simplejson python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl
-+        sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl
-         sudo apt install libio-socket-inet6-perl libxml-simple-perl libqt5sql5-mysql libwayland-dev qtbase5-private-dev libzip-dev libsoundtouch-dev
-       if: runner.os == 'Linux'
- 
 diff --git a/mythtv/configure b/mythtv/configure
 index 7e966ef817..3429c208e2 100755
 --- a/mythtv/configure
@@ -98,7 +84,7 @@ index 1bcc8060d0..464f068d6f 100644
 2.41.0
 
 
-From 13f65c0015d3e0d82d01a1dd5c15afe0ff1e8029 Mon Sep 17 00:00:00 2001
+From 7c1dbe7a86dc9b445a1a491f5a849b0eba21aead Mon Sep 17 00:00:00 2001
 From: Eli Schwartz <eschwartz93@gmail.com>
 Date: Wed, 13 Dec 2023 23:11:11 -0500
 Subject: [PATCH 2/2] hardwareprofile: remove ancient "future" compatibility
diff --git a/media-tv/mythtv/mythtv-33.1-r1.ebuild b/media-tv/mythtv/mythtv-33.1-r1.ebuild
index 344b691045d3..d0d9cd8758c6 100644
--- a/media-tv/mythtv/mythtv-33.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-33.1-r1.ebuild
@@ -147,10 +147,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-33.1-libva.patch
 	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch
 	"${FILESDIR}"/${PN}-33.1-linux-headers-6.5.patch
-	# https://github.com/MythTV/mythtv/pull/824
-	# https://github.com/MythTV/mythtv/pull/838
-	# https://bugs.gentoo.org/888291
-	"${FILESDIR}"/${PN}-33.1-python3.12.patch
 )
 
 python_check_deps() {
@@ -167,6 +163,11 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	# https://github.com/MythTV/mythtv/pull/824
+	# https://github.com/MythTV/mythtv/pull/838
+	# https://bugs.gentoo.org/888291
+	eapply -p2 "${FILESDIR}"/${PN}-33.1-python3.12.patch
+
 
 	# Perl bits need to go into vendor_perl and not site_perl
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \