[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, profiles/arch/alpha/, media-tv/v4l-utils/files/, profiles/, ...

[gentoo-commits] repo/gentoo:master commit in: media-tv/v4l-utils/, profiles/arch/alpha/, media-tv/v4l-utils/files/, profiles/, ...

[Arthur Zamarin]

commit:     92d4e854c1d553d859e45125e5c14a2f14b6adf4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  6 18:29:19 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  6 18:33:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d4e854

media-tv/v4l-utils: treeclean

Closes: https://bugs.gentoo.org/936674 (pkgremoved)
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-tv/v4l-utils/Manifest                        |   1 -
 .../v4l-utils-1.22.1-no-stack-protector-bpf.patch  |  25 -----
 media-tv/v4l-utils/metadata.xml                    |  11 --
 media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild      | 123 ---------------------
 media-tv/v4l-utils/v4l-utils-1.26.ebuild           |  14 ---
 profiles/arch/alpha/package.use.mask               |   1 -
 profiles/arch/powerpc/ppc32/package.use.mask       |   1 -
 profiles/arch/sparc/package.use.mask               |   1 -
 profiles/package.mask                              |   5 -
 9 files changed, 182 deletions(-)

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
deleted file mode 100644
index eaca215a25f2..000000000000
--- a/media-tv/v4l-utils/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170

diff --git a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch b/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
deleted file mode 100644
index 0ee28643ea1c..000000000000
--- a/media-tv/v4l-utils/files/v4l-utils-1.22.1-no-stack-protector-bpf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-SSP doesn't make sense for BPF.
-
-https://bugs.gentoo.org/889561
---- a/utils/keytable/Makefile.am
-+++ b/utils/keytable/Makefile.am
-@@ -22,7 +22,7 @@ ir_keytable_LDFLAGS = $(ARGP_LIBS)
- 
- if WITH_BPF
- ir_keytable_LDFLAGS += $(LIBELF_LIBS) $(LIBBPF_LIBS)
--ir_keytable_CFLAGS = $(LIBBPF_CFLAGS)
-+ir_keytable_CFLAGS = $(LIBBPF_CFLAGS) -fno-stack-protector
- SUBDIRS = bpf_protocols
- endif
- 
---- a/utils/keytable/bpf_protocols/Makefile.am
-+++ b/utils/keytable/bpf_protocols/Makefile.am
-@@ -8,7 +8,7 @@ CLANG_SYS_INCLUDES := $(shell $(CLANG) -v -E - </dev/null 2>&1 \
-         | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }')
- 
- %.o: %.c bpf_helpers.h
--	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -c $<
-+	$(CLANG) $(CLANG_SYS_INCLUDES) -D__linux__ -I$(top_srcdir)/include -target bpf -O2 -fno-stack-protector -c $<
- 
- PROTOCOLS = grundig.o pulse_distance.o pulse_length.o rc_mm.o manchester.o xbox-dvd.o imon_rsc.o raw.o samsung36.o
- 

diff --git a/media-tv/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml
deleted file mode 100644
index a320ecd97a79..000000000000
--- a/media-tv/v4l-utils/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
-<use>
-	<flag name="bpf">Enables support for IR BPF decoders.</flag>
-</use>
-</pkgmetadata>

diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
deleted file mode 100644
index 1294a25de248..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.22.1-r1.ebuild
+++ /dev/null
@@ -1,123 +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-1:=
-		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.22.1-no-stack-protector-bpf.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
-	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
deleted file mode 100644
index 179042a3715e..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.26.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Transitional package to be superseded by media-libs/libv4l[utils]"
-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"
-IUSE="+bpf dvb qt5"
-
-RDEPEND=">=media-libs/libv4l-${PV}[utils,bpf?,dvb?,qt5?]"

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index aaeb3a221a78..58071d9fab0d 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -338,7 +338,6 @@ media-video/ffmpeg dav1d libaribb24 libtesseract
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
 # USE=bpf depends on sys-devel/clang which is not keyworded on alpha.
 media-libs/libv4l bpf
-media-tv/v4l-utils bpf
 
 # Patrick McLean <chutzpah@gentoo.org> (2020-02-15)
 # Mask until dev-libs/libfido2 is keyworded

diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index ce249e5c12d9..bf02a9359c47 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -204,7 +204,6 @@ dev-python/pyopengl test
 # Andrey Utkin <andrey_utkin@gentoo.org> (2020-03-11)
 # USE=bpf depends on sys-devel/clang which is not keyworded on ppc.
 media-libs/libv4l bpf
-media-tv/v4l-utils bpf
 
 # Matthew Thode <prometheanfire@gentoo.org> (2020-02-17)
 # Mask until net-analyzer/icinga2 is keyworded

diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index da631e3b0a79..9c99b995cdf4 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -408,7 +408,6 @@ x11-libs/qwt designer
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-15)
 # USE=bpf depends on sys-devel/clang which is not keyworded on sparc
 media-libs/libv4l bpf
-media-tv/v4l-utils bpf
 
 # Rolf Eike Beer <eike@sf-mail.de> (2020-04-14)
 # dev-lang/luajit is not keyworded on sparc

diff --git a/profiles/package.mask b/profiles/package.mask
index b705bf737042..2498aaae0b38 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -239,11 +239,6 @@ dev-libs/libindicator
 # Removal on 2024-09-01.
 app-backup/mkstage4
 
-# James Le Cuirot <chewi@gentoo.org> (2024-07-29)
-# Superseded by media-libs/libv4l[utils].
-# Removal on 2024-08-29. Bug #936674.
-media-tv/v4l-utils
-
 # Eli Schwartz <eschwartz@gentoo.org> (2024-07-29)
 # Bad version can result in failing builds. Please upgrade to 72.1.0.
 =dev-python/ensurepip-setuptools-72.0.0