gentoo auto-resync : 07:08:2024 - 12:37:20

15 files changed, 24 insertions, 283 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index a0ef0fdd6b27..cb3a7bc20c7e 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 07e25c77329d..cc14ba244341 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,6 +1,4 @@
-DIST dtv-scan-tables-2021-04-30-4181e93a30ab.tar.bz2 272870 BLAKE2B b9672235ad2ed826205278ffd06ed793126f743fe2b0b8af4369c1cb24825662e579f9246a287df1d61efad7985e2e18d59097d359fe84626149464bfc253bc5 SHA512 c15c07937cabefad731f4b3f8b6e9f993e500f7c59b17ef5e5c46f9bb86f9cbdf748f7d875c363c641ed9f3333a03b5033cc7d0272e96323d36be944ea35379d
 DIST dtv-scan-tables-2022-04-30-57ed29822750.tar.bz2 277444 BLAKE2B dd9d74f5daa1633262e44329d3122231123255ecba4f944c8afb2ed1120e7319b371960a719622608f4059085adcd18644fdaeb27b38d233d18ed35b1d4bde80 SHA512 2f5b76bca43f2749c452978143dec6e069aa4ea6283ac9ceac95bb950dbc589b4ed9cec2874b16d31408790b17e25d48e82aa958ac9c4440b26b0dbcde25f0cb
-EBUILD dtv-scan-tables-0_p20210430.ebuild 744 BLAKE2B 71e1188eaa705c884d6ed2a6a0716d3dce2ea97e140a1d499e2cf6fee4c0c4dd5de7d56ae6760c471ea3523bc9e6918460fb08ccc43a51902e36ff45a446d06c SHA512 b530ebab3b5d664dcbd0d41581d95ae73733d9b0b6e53806a2b6fb0cfc8cde4f578cf7100c346f30df90ab9a32bbf035374f506a50e0dd21cde66999f16a2f8f
-EBUILD dtv-scan-tables-0_p20220430.ebuild 748 BLAKE2B 8e4756be4a0e990d4bc592d8671786802bd4a446205753b9689804d84439b1dbcfc91bc41459439f515e5e1693435c4e0c1c9a78afbfd95586559ea245d4751d SHA512 45e9a8bf1e6b4585cca536ab54c1127810f5759d31e1a008e282e8265f277223a6229ceeaaa47b1c2b48e9afc24fcb97ce7c3cea2403c4fde490e83aac090f90
+EBUILD dtv-scan-tables-0_p20220430.ebuild 743 BLAKE2B a276253760cd5db42fbf7e9b3f82b6d221399fc2ab6dede2c384402237ce365105dd1fa7b39f7b32e83d7227ae42d0c9da9cf930901a83acdee385059ef65377 SHA512 31715dee488e14911b5503fc17c80a5c67c3754919c8bad46a8d16642f5ce2952ef185d73545ba0a50db5b28d851922314e89d745798abd7d2cc2940f04e416e
 EBUILD dtv-scan-tables-9999.ebuild 748 BLAKE2B 4e23eb767cbad67997d58b202b1126fe962fa72d0f8cb183213f260194cc385f825ad5eeb595e1077b4fc8e6fecd3d4da1b2a9a95506110f1f23152973a90bd5 SHA512 db8180eecef1dadfe9c5bbfd6ffd840b731241a047f385808b5b4c7b8c864f96a838c9d0e182d8fca8d2e7727db59fc2dcf68b2d033a58fbcf621f3fb2be2ca6
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
deleted file mode 100644
index cf480e07e488..000000000000
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20210430.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
-else
-	COMMIT="4181e93a30ab"
-	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc x86"
-	S="${WORKDIR}/usr/share/dvb"
-fi
-
-DESCRIPTION="Digital TV scan tables in v3 and v5 format"
-HOMEPAGE="https://linuxtv.org/"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-BDEPEND=">=media-tv/v4l-utils-1.4[dvb(+)]"
-
-DOCS=( README )
-
-src_compile() {
-	emake dvbv3 dvbv5
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install install_v3
-	einstalldocs
-}
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20220430.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20220430.ebuild
index 0bf6ab15bdeb..04ab2d346626 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20220430.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20220430.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 else
 	COMMIT="57ed29822750"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc x86"
 	S="${WORKDIR}/usr/share/dvb"
 fi
 
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index 73152c10976d..b652f7369ecc 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,6 +1,6 @@
 AUX ivtv-utils-1.4.0-gentoo.patch 2423 BLAKE2B cf0cb7fb1ea7c0d9cd62b6d2fce3e342b45b835b1d27708f431fcc371e5f7763d4fcc3809d3e775a6d6a9b08077825ea5786f948c480e72931e2e7db2339abb0 SHA512 1737dc876704775dbcd361af38dce65711215a25c3e7b5c0f4f447518d9752b3488df308ef82693ce2c7471600527d49c374209bee02e1686575d15cf3ac06cd
 AUX ivtv-utils-1.4.1-overflow.patch 1774 BLAKE2B 7ec6fe101125f367a90f54b771f9ac6bd2179e94986115177e34d2fc294cffd9d893b9aeb15e629f1990c99c5d7d3d6d5b4189d3dac8cc24f572b2b2bab91796 SHA512 5c19bc5420f0e7f1f501b0e117fdd3108799607f380bc8609ccd9126eb6fade4da21a41918f88613127969afd6712ab19bcb2dbc295d93454f5da918609c66eb
+AUX ivtv-utils-1.4.1-redefine.patch 434 BLAKE2B 00fd6a71cd9567116388daae634c3da9c57a5b69b3544a4f4faf2dee0dca974ea06ae49eea9a50e773a68d6269a333406b4b63ceed90915deef06527df5df8b1 SHA512 41caddff5d1c06e3717b07134d7d8935587fd93ab715fc2676c039af4971c67ba7663634d52c5e7db6bdc9e7dfd3639f749ddf8c64650114b1f8d1272421398e
 DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
-EBUILD ivtv-utils-1.4.1-r1.ebuild 940 BLAKE2B f1288ce5f18923e5f4750d6c72469477c2cebcca6a32556443d436b5af10f215e8fb5a790b903534648a62f80010d4b077e8317894196205c3a956ec95a418bc SHA512 e2cfd9b23f72d6b065c6afe19d559a374228e06b746652c2709b76d4849bc1200288042c2a5b9e4a0b58c0b12891b7172001aa4260e06368e4a2236c475a3137
-EBUILD ivtv-utils-1.4.1.ebuild 962 BLAKE2B 2862aedc8eecbdefbf652432f2c158bcc3b8581912edb3022fabc494ad3f7bae179247714f085a6295d4ab810e65e47a4a1b5454a1c41dd6cf8a219be4f44244 SHA512 101e2f791b4505ff6ce67cad51c41add877fd4428169bdeaa10493045fa2852189aa66cbfca48e048a62b274364dcee44e812ddd7b9ec173bd812b050a52fbf5
+EBUILD ivtv-utils-1.4.1-r1.ebuild 980 BLAKE2B b6454699c9025cf08d35301fb7447286fc39be8b6847f8e2a4e899d3eda5acd0934e67b60407d344fcfb1134ac61d810efda1e523052968bdc4fd29bfb05f8f4 SHA512 f68e1593924bcd48e8dc7efd36d06a02875914cd6576c47b713b819bb0cf77e75bd9d7672b261e39fb0502bc0cddfc741f1b544fcf1aaaf1d82d19140104edde
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch
new file mode 100644
index 000000000000..70a1d0ed1745
--- /dev/null
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-redefine.patch
@@ -0,0 +1,12 @@
+This is already defined in linux/fb.h, and the int type is wrong anyway.
+
+diff -Naur a/utils/linux/ivtvfb.h b/utils/linux/ivtvfb.h
+--- a/utils/linux/ivtvfb.h	2024-07-26 21:36:14.167005194 +0100
++++ b/utils/linux/ivtvfb.h	2024-07-26 21:36:23.785286007 +0100
+@@ -32,6 +32,5 @@
+ };
+ 
+ #define IVTVFB_IOC_DMA_FRAME 	_IOW('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
+-#define FBIO_WAITFORVSYNC	_IOW('F', 0x20, u_int32_t)
+ 
+ #endif
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild
index 14068ad3896f..d1f7bc8fbbe3 100644
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/$(ver_cut 1-2).x/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="perl"
 
 RDEPEND="
@@ -27,6 +27,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0-gentoo.patch
 	"${FILESDIR}"/${PN}-1.4.1-overflow.patch
+	"${FILESDIR}"/${PN}-1.4.1-redefine.patch
 )
 
 src_configure() {
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
deleted file mode 100644
index 57a6fc766ab5..000000000000
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
-HOMEPAGE="http://www.ivtvdriver.org/"
-SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/$(ver_cut 1-2).x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="perl"
-
-DEPEND="!media-tv/ivtv"
-RDEPEND="${DEPEND}
-	media-tv/v4l-utils
-	perl? (
-		dev-perl/Video-Frequencies
-		dev-perl/Video-ivtv
-		dev-perl/Config-IniFiles
-		dev-perl/Tk
-		virtual/perl-Getopt-Long
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-gentoo.patch
-	"${FILESDIR}"/${PN}-1.4.1-overflow.patch
-)
-
-src_configure() {
-	tc-export CC CXX
-
-	# bug 907679
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc -r ChangeLog README doc/.
-
-	if use perl; then
-		dobin utils/perl/*.pl
-		dodoc utils/perl/README.ptune
-	fi
-}
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 0e85c65b7cc7..96d7752e4346 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -12,5 +12,5 @@ AUX mythtv-33.1-python3.12.patch 11069 BLAKE2B c03b53e15a37cb5236248045f1b8b74b0
 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 10435 BLAKE2B 3e786b60da934873979774da36a66153aab9ad2a5a7e458f338268b4fecfce7dda1b9cbbc96c789c0f9e50e96fbeb8a334e04f8212bc99cc47a0f1c895a29ed1 SHA512 74ae37cf65196cbf55f346ce32461e34cd8631b1e8030a70f9d5ab93653c49914977851ad04d0bcc1c24995f1e37bc406188b2ddc1ade1001911eb12044b742c
+EBUILD mythtv-33.1-r1.ebuild 10435 BLAKE2B 26ed5632e3903af0e195b2744d27cf2e30e1a39b0138411bb3ab99172bfb77ff5d9c01ed46b5e1d20fdfe1ed3684380d052dbf1d336efa29741af4ce2e611743 SHA512 d51b2d5e56a5701b5fae19b991cc7f7e9a7e741c31a46afbf4b685600d909270dc9bf2babe0370f38ab7523e122b96a87e0f4c3c53b050f3765f404640f119aa
 MISC metadata.xml 1983 BLAKE2B 3aad016c2964bbb51e234c8c4c91fa1945837adb30db1445a593f227eb8d1068c78e218bbdfb26591ce34bf61bcb2967653a009f9306602bcb15faeb9152635e SHA512 f369462e9e7b79c22325b3c95560cab83919c598526cd955963c97d5d3fc7764260d98a4565a9a64251119a8cc656f485a96f326881884132a0c29975319f4d7
diff --git a/media-tv/mythtv/mythtv-33.1-r1.ebuild b/media-tv/mythtv/mythtv-33.1-r1.ebuild
index f2564d87e018..34c97cbba763 100644
--- a/media-tv/mythtv/mythtv-33.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-33.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISABLE_AUTOFORMATTING="yes"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit edo flag-o-matic java-pkg-opt-2 java-ant-2 python-any-r1
 inherit qmake-utils readme.gentoo-r1 systemd toolchain-funcs user-info
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index e668266034f9..d54ff61e1d2f 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,9 +1,5 @@
 AUX v4l-utils-1.22.1-no-stack-protector-bpf.patch 1010 BLAKE2B aa8475fd643b1736fe3ad41c77d2debf0fe19f501d8edc56562d39d3dfabea7910e324fdab3951e6bb0a6cdb22bfaea002824189e0189bdec4d66a5b3feda470 SHA512 b0737955b566354b047b296822ed1ba0f573ebd1667d9455d6a08e5f839920f08a1e8b0d98f2515fa93f11ff7f22e5ed7044b8f96b632803260349a3a6e3cf67
-AUX v4l-utils-1.24.1-musl-include.patch 228 BLAKE2B 9eecd67c3687271c47e6a80ba2061d95f4167e52cb78213d9599cfa07f45fe396dd33d4c0ca6c910515d53f4755080c619e97cff1e907e29c9f72bab2c4b40d1 SHA512 f801227dac6735d811bc5d4b77150a3f0b1c661db0373848f60bbc6842d1f488f8baadc20dbb39c469ad09e151afcfa10421f35f4c0d185a67606246e5ec86e0
-AUX v4l-utils-1.24.1-musl-lfs.patch 1555 BLAKE2B 1aa5939aa02a3eb7a22a12f0a7db0b0c720eeeb07793099c86af39e6f014c0c7cf5ba97ed1fac1ca1acd9d2ef6d8b2fb531207b03a1c16df79e11fdabbde9d73 SHA512 228f14ea086ad88e5011a5c4518eb70c187cb829d8ea6be97e292e9b96018fe19690bf3ab26e248f1a5a691702027c01f629b75bbe59395104ca2af898bd6346
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-DIST v4l-utils-1.24.1.tar.bz2 2238340 BLAKE2B 1702918699d47b17467e012c2b1875c58851175c1007351a3b40d0b0fa40437eb695efa9e21afe3351f66780899d45798eef7f23c90a4831bface70a245b8a54 SHA512 1e82ba125285e875bf4a216adedab9147009e6af1aadd79a3a1770231d3c96ec29245b33e75f69a9ce1b25011e71746db242c778ac3369148de1e9de2e318663
 EBUILD v4l-utils-1.22.1-r1.ebuild 2877 BLAKE2B 7733fd090122d2661d314ef6db9841913229166bfb4e13e92414e2c29ef23fb0f162d71f8c69182ea2b297a7dc9880e9f26643932fdfaa146afddfb64d77c738 SHA512 28bb40f504b770cf79785bc843625a0ffc075ba7235db65c257ec5cc2a41145e83b666fb7df68cd22a5c34f488db4d89b2a016ab32fe14a28189ce1d23269fc7
-EBUILD v4l-utils-1.24.1.ebuild 2909 BLAKE2B 4b71eefd91b37d32701d4fb3a9d3b72b040c1f42e2e0f31c91e5233da8fd81caaf20b9aaf6747d8c56f478072288fd00c8a9b9baae2ee0f5f7e2fa554af79f91 SHA512 9fe5c4467e60c9dd40a476a3e7b98202d4565cfc463a512191c5671bef68e593fe2ed19847c9feeb3f2798cb7d54dff7017270967037d83bac17fd82fe7fde8a
-EBUILD v4l-utils-1.26.ebuild 419 BLAKE2B 92496d0efe31d2c94f2fdad5b236229995373ef302ee1b7e2eb8de66f85f6d87bc3adca7f09440d82a478ddfd6661bdb98e9b005291834ddb0bda233871ab500 SHA512 0cac8e4ed86f610a24c864b0402a93945a55049aca21a6f16b7dd25ef244b52021bb2bf353f3aa913484042be7db034ef2d4225a58e19909c97c2f113728c2cc
+EBUILD v4l-utils-1.26.ebuild 414 BLAKE2B 0d8ad756f1f31e60c43f4c02cd7e67bf9357c0a076b9f1d522c25f9fe79e4b7e64deca3dfcee7a77939f32433f58f09cd32d6f7a8c5d8deda29a725636fafa39 SHA512 72ea61b8bf3ce978d1a1c406b70d68911943b0397e8e2594e437fb675e543c5a3fcc7116c4fc15d07aee3b1cb995b258f22a1ffe82c82561c48194f24f567ef8
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch
deleted file mode 100644
index 8738f272aaed..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/908380
---- a/utils/common/media-info.h
-+++ b/utils/common/media-info.h
-@@ -5,6 +5,7 @@
- 
- #ifndef _MEDIA_INFO_H
- #define _MEDIA_INFO_H
-+#include <sys/types.h>
- 
- enum media_type {
- 	MEDIA_TYPE_CANT_STAT,
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch b/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch
deleted file mode 100644
index 196b7430ca5c..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.24.1-musl-lfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://git.linuxtv.org/v4l-utils.git/commit/?id=5d7d99cd11acaaa3bdcb290f92012005dca58b1e
-
-From 5d7d99cd11acaaa3bdcb290f92012005dca58b1e Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 31 Mar 2023 23:35:02 +0200
-Subject: v4l2-tracer: wrap open64/mmap64 functions only if linux && __GLIBC__
-
-Wrap open64/mmap64 functions only if linux && __GLIBC__, as done
-in lib/libv4l1/v4l1comapt.c and lib/libv4l2/v4l2convert.c since
-commit 'libv4l: Wrap LFS64 functions only if linux && __GLIBC__'
-(403a4e2697a1ff96fe2fa16589039595f21cadf0), should fix musl libc
-compile.
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---- a/utils/v4l2-tracer/libv4l2tracer.cpp
-+++ b/utils/v4l2-tracer/libv4l2tracer.cpp
-@@ -83,6 +83,7 @@ int open(const char *path, int oflag, ...)
- 	return fd;
- }
- 
-+#if defined(linux) && defined(__GLIBC__)
- int open64(const char *path, int oflag, ...)
- {
- 	errno = 0;
-@@ -110,6 +111,7 @@ int open64(const char *path, int oflag, ...)
- 
- 	return fd;
- }
-+#endif
- 
- int close(int fd)
- {
-@@ -156,6 +158,7 @@ void *mmap(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
- 	return buf_address_pointer;
- }
- 
-+#if defined(linux) && defined(__GLIBC__)
- void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
- {
- 	errno = 0;
-@@ -170,6 +173,7 @@ void *mmap64(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
- 
- 	return buf_address_pointer;
- }
-+#endif
- 
- int munmap(void *start, size_t length)
- {
--- 
-cgit v1.2.1
diff --git a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
deleted file mode 100644
index 3d4eaac93b9a..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.24.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs udev xdg
-
-DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+bpf dvb opengl qt5 +udev"
-
-RDEPEND="
-	>=media-libs/libv4l-${PV}[dvb?]
-	bpf? (
-		dev-libs/libbpf:=
-		virtual/libelf:=
-	)
-	udev? ( virtual/libudev )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
-		media-libs/alsa-lib
-	)
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
-"
-
-# Not really prebuilt but BPF objects make our QA checks go crazy.
-QA_PREBUILT="*/rc_keymaps/protocols/*.o"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.24.1-musl-include.patch
-	"${FILESDIR}"/${P}-musl-lfs.patch
-)
-
-check_llvm() {
-	if [[ ${MERGE_TYPE} != binary ]] && use bpf; then
-		local clang=${ac_cv_prog_CLANG:-${CLANG:-clang}}
-		${clang} -target bpf -print-supported-cpus &>/dev/null ||
-			die "${clang} does not support the BPF target. Please check LLVM_TARGETS."
-	fi
-}
-
-pkg_pretend() {
-	has_version -b sys-devel/clang && check_llvm
-}
-
-pkg_setup() {
-	check_llvm
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use qt5; then
-		local qt5_paths=( \
-			MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
-			UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
-			RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
-		)
-		if ! use opengl; then
-			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
-		fi
-	fi
-
-	# Hard disable the flags that apply only to the libs.
-	econf \
-		--disable-static \
-		$(use_enable dvb libdvbv5) \
-		$(use_enable qt5 qv4l2) \
-		$(use_enable qt5 qvidcap) \
-		$(use_enable bpf) \
-		--without-jpeg \
-		$(use_with udev libudev) \
-		--with-udevdir="$(get_udevdir)" \
-		"${qt5_paths[@]}"
-}
-
-src_install() {
-	emake -C utils DESTDIR="${D}" install
-	emake -C contrib DESTDIR="${D}" install
-
-	dodoc README.md
-	newdoc utils/libv4l2util/TODO TODO.libv4l2util
-	newdoc utils/libmedia_dev/README README.libmedia_dev
-	newdoc utils/dvb/README README.dvb
-	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	use udev && udev_reload
-
-	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
-		ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
-		ewarn "you may need to take action to avoid breakage. See"
-		ewarn "https://bugs.gentoo.org/767175 for more details."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	use udev && udev_reload
-}
diff --git a/media-tv/v4l-utils/v4l-utils-1.26.ebuild b/media-tv/v4l-utils/v4l-utils-1.26.ebuild
index 4c300a474c80..179042a3715e 100644
--- a/media-tv/v4l-utils/v4l-utils-1.26.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="+bpf dvb qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[utils,bpf?,dvb?,qt5?]"