4 files changed, 24 insertions, 41 deletions
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index f85f0c232706..cd5aa80a8090 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,6 +1,7 @@
 AUX libcec-4.0.7-no-override-udev.patch 850 BLAKE2B ce5c795ba3db2d6600b93af6d15d95794435b22c29eb0b65f1d6dbcbb877f076abafd2b2b8d7bd751b981a34a939d61bf7389118a7252d7fc0517c472f583fc2 SHA512 fb23ccc01fee0c61453490e2f8037b1d30124077847e09f8a5e08365bca3253fa883484d412ae1f60cd7beefc6f2075a83bcdd36e160b14ebae23f4be41fb78b
 AUX libcec-6.0.2-musl-nullptr.patch 829 BLAKE2B cfad08ba094e7ca92caec9a38d77d3d65b5baedf49db2b131b33a84543c2ccd0f60b99e7100434a302710c8bcf0d526a6033aa119c8f274efeff277388e75d6d SHA512 015055905a639a8599d5b0766a17bd6b3c91feb59eba543b55919fe40d9bcd0deebdd1b29a9b92e718c7d1bf8486d8413dfea986bf2639e984ba9f8b7a162d0a
 DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
-EBUILD libcec-6.0.2-r1.ebuild 3427 BLAKE2B d5bbd4db1c687a3bdff500ecc1095eeb0fece35018e8e2cdad96c1a9507a6e4d0b6bb390ff7e2a918f6200f7369426a8d7335753c12895904d460f686f83f7af SHA512 dc4537a129eaae3db38cccf9f9db77a522a8491aeca9b6ba6879e92ca93f985ecb96ed6b4f6c9f1b0e47e654743c3bb959a2f3cabc73753648cc363a7421b213
-EBUILD libcec-6.0.2-r2.ebuild 3032 BLAKE2B 4fd7205a1fec64674982d40ca0e594a75b99e074ca4b7e847a622017a9296b0b064ec894ac3cb8bb2df02d726137ec9a00745fcf5a66cd16c444a00e53d3222a SHA512 1d40ea8d3378aada81499800b7ecbab33fae5ded86b5bddffaefc2dfec2f07a40da357a064e64f6a70d11995bb9e5ddeb759fa525e590f591ad552abf34a8c5b
-MISC metadata.xml 828 BLAKE2B 55df5b9af327507fdb9f415c8616affc437d82ac5a7e57b53f21f7917285b10f70e58b3fdbebf6899aa8c10dbe73186f84643842b04953da74f94b6c4112b3d6 SHA512 25e981d2c88ce87c9c41f6816dfadeb00bf3e0d5dfebc8b135ceba09552c40c29501bede0e3a73a63dcacb0741167f6180a674d82cf2b66dfb649a4aa968387a
+DIST libcec-7.0.0.tar.gz 362134 BLAKE2B ce1f49360d0560945757655ecbbfe8d4b776c8ac3d1014f2f176ac14c6e6d8847d853aa0aeed955fa218fafc4fd45b505ad4256a2ce47cdebd439f497a4f6cae SHA512 76e6686252dd53fca72130fadcc90d88f6b255a6fed12330d68ef0cc3f34906053ecfc23c6570991614c49857e13bbb37963fea5803560a19a97f097f4b0ae60
+EBUILD libcec-6.0.2-r2.ebuild 2838 BLAKE2B 5d5294bc92f0673c1e4879372567cbf0dd131a9e4e3c62eacff0ed2a6eafe55a98315fbbbb4ca8d0575799b831a550be6e3d327f8c8cf2786eb11f6053945aac SHA512 cd7375dfd3ffe409ab162e7fb69453e53d78179f677928997341168747714e38141876ef03c05f3cbb0e433ed47a408056d4d8622bd41a5d50bd8abd39cc19b6
+EBUILD libcec-7.0.0.ebuild 2827 BLAKE2B 73efe7643ce42d0c971dfaa7e43c3c0127e60804db7bb1c5f9ee38894a553a02ee44e412f3bc0fa02a72d16a8e61d24cca5c0b3d53f716d76e321a8782d84674 SHA512 5d1b721ca6d107c8032114771d6e2999ca403162205a2afca0fbb9f15462968148e2a7c72d78f837feb5a1c7de7689ce4ee1bef672a2d768bd32782a9bd1c8e0
+MISC metadata.xml 675 BLAKE2B 20321b6f47fe8fa28c08447f263f65c571193e7b1609ea5dac36f757f968b07bedf9a529f3a12306d272612d14f55ca632e518ca2ee48b844adc89cdda7be089 SHA512 70d5e402e3d9afb4d8da2d5feb06044c0625103d67ba8c90dc96d5c49f20aed11f3e88b3a3a73b9fa549d342c03f215664c93400bd52088a23e0a70c3516a733
diff --git a/dev-libs/libcec/libcec-6.0.2-r2.ebuild b/dev-libs/libcec/libcec-6.0.2-r2.ebuild
index eb9dc1969acd..34046941a2bb 100644
--- a/dev-libs/libcec/libcec-6.0.2-r2.ebuild
+++ b/dev-libs/libcec/libcec-6.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="cubox exynos kernel-cec python tools udev +xrandr"
+IUSE="exynos kernel-cec python tools udev +xrandr"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/libplatform-2.0.0
@@ -55,11 +55,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:"lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}":${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
 	sed -Ee 's|[ ~]?#DIST#;?||g' debian/changelog.in > ChangeLog || die
 
 	(use tools && use python) || cmake_comment_add_subdirectory "src/pyCecClient"
@@ -78,7 +73,8 @@ src_configure() {
 		-DHAVE_LIBUDEV=$(usex udev ON OFF)
 		-DSKIP_PYTHON_WRAPPER=$(usex python OFF ON)
 		-DHAVE_EXYNOS_API=$(usex exynos ON OFF)
-		-DHAVE_TDA995X_API=$(usex cubox ON OFF)
+		# bug 922690 and bug 955124
+		-DHAVE_TDA995X_API=OFF
 		-DHAVE_RPI_API=OFF
 	)
 
diff --git a/dev-libs/libcec/libcec-6.0.2-r1.ebuild b/dev-libs/libcec/libcec-7.0.0.ebuild
index f6382bb14788..fcc38ac3d7ff 100644
--- a/dev-libs/libcec/libcec-6.0.2-r1.ebuild
+++ b/dev-libs/libcec/libcec-7.0.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
-inherit cmake linux-info python-single-r1 toolchain-funcs udev
+inherit cmake linux-info python-single-r1 udev
 
 DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
 HOMEPAGE="https://libcec.pulse-eight.com"
@@ -17,12 +17,11 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="cubox exynos kernel-cec python raspberry-pi tools udev +xrandr"
+IUSE="exynos kernel-cec python tools udev +xrandr"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/libplatform-2.0.0
 	python? ( ${PYTHON_DEPS} )
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
 	udev? ( virtual/udev )
 	xrandr? (
 		x11-libs/libX11
@@ -36,11 +35,6 @@ BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~USB_ACM"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.7-no-override-udev.patch"
-	"${FILESDIR}/${PN}-6.0.2-musl-nullptr.patch"
-)
-
 pkg_pretend() {
 	use udev || CONFIG_CHECK+=" ~SYSFS"
 	ERROR_SYSFS="When using libcec build without udev, kernel config option CONFIG_SYSFS is required to automatically detect P8 USB-CEC adapter port number"
@@ -56,11 +50,6 @@ pkg_setup() {
 src_prepare() {
 	cmake_src_prepare
 
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:"lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}":${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
 	sed -Ee 's|[ ~]?#DIST#;?||g' debian/changelog.in > ChangeLog || die
 
 	(use tools && use python) || cmake_comment_add_subdirectory "src/pyCecClient"
@@ -75,25 +64,24 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DHAVE_LINUX_API=$(usex kernel-cec ON OFF)
-		-DHAVE_LIBUDEV=$(usex udev ON OFF)
-		-DSKIP_PYTHON_WRAPPER=$(usex python OFF ON)
-		-DHAVE_EXYNOS_API=$(usex exynos ON OFF)
-		-DHAVE_TDA995X_API=$(usex cubox ON OFF)
-		-DHAVE_RPI_API=$(usex raspberry-pi ON OFF)
+		-DSKIP_PYTHON_WRAPPER=$(usex !python)
+
+		# Same order as in src/libcec/cmake/CheckPlatformSupport.cmake
+		-DHAVE_DRM_EDID_PARSER=ON
+		-DHAVE_LIBUDEV=$(usex udev)
+		-DHAVE_RANDR=$(usex xrandr)
+		-DHAVE_RPI_API=OFF
+		# bug 922690 and bug 955124
+		-DHAVE_TDA995X_API=OFF
+		-DHAVE_EXYNOS_API=$(usex exynos)
+		-DHAVE_LINUX_API=$(usex kernel-cec)
+
 	)
 
 	if linux_config_exists && linux_chkconfig_present SYSFS; then
 		mycmakeargs+=( -DHAVE_P8_USB_DETECT=ON )
 	fi
 
-	# raspberrypi-userland itself does not provide .pc file so using
-	# bcm_host.pc instead
-	use raspberry-pi && mycmakeargs+=(
-		-DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
-		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
-	)
-
 	cmake_src_configure
 }
 
diff --git a/dev-libs/libcec/metadata.xml b/dev-libs/libcec/metadata.xml
index 9b4ef0497a27..785f8f1546b0 100644
--- a/dev-libs/libcec/metadata.xml
+++ b/dev-libs/libcec/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
   <!-- maintainer-needed -->
   <use>
-    <flag name="cubox">Enable support for enable support for the TDA995x</flag>
     <flag name="exynos">Enable support for Exynos chipsets</flag>
-    <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
     <flag name="xrandr">Enable detection of active HDMI using xrandr extensions</flag>
     <flag name="kernel-cec">Enable support for Linux kernel CEC framework</flag>
     <flag name="tools">Enable build of cec-client and other test and demo executable tools</flag>