6 files changed, 137 insertions, 122 deletions
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 75c4a0b749c1..a24313c59b92 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,9 +1,8 @@
-AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
 AUX libcec-4.0.7-no-override-udev.patch 850 BLAKE2B ce5c795ba3db2d6600b93af6d15d95794435b22c29eb0b65f1d6dbcbb877f076abafd2b2b8d7bd751b981a34a939d61bf7389118a7252d7fc0517c472f583fc2 SHA512 fb23ccc01fee0c61453490e2f8037b1d30124077847e09f8a5e08365bca3253fa883484d412ae1f60cd7beefc6f2075a83bcdd36e160b14ebae23f4be41fb78b
-DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
 DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200e79332470d2b5b2e64966834a0604d4684ad5919a00aaf60f05f4dbbbc9ce13a0dcf0ba4fa11d1f6a0391673 SHA512 424540a45f9cae3d5dcccc615d487c45033f9cdeb665b8176832495597e2cd58ef7681e13b52f6a32f8a40e1146c04a1a383f5785ea1e731c5c517a9a7843a81
-EBUILD libcec-4.0.2-r2.ebuild 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296
-EBUILD libcec-4.0.4-r1.ebuild 2040 BLAKE2B e304595a2b71afee365435d94118a21a3fd14098d2d88be082d96ccbd35d74e3bbf88eff89e880e26480af375505afc1d45ad5adddde687907e1ffa5bc95cc40 SHA512 2033915d614f6155ee1d5bcb287a4218ffa3b116247e33d06ce8979950abd202fcddb5fda32937310a46ad7180e86f78eb9a72f4b4476a52887e82828a65971b
-EBUILD libcec-4.0.7.ebuild 3297 BLAKE2B 50f35a47f4ed68092f94f6e2c9e2a5b5a4de0bc6c4181b28ee212f4ec8ffd0dac9b0c04c662cba3286293c766304f632b75ef800c89d856c2451f38d76505127 SHA512 e77db16d409ec6412f2734a58b501ef6ee7f0289b17519e0af9c3a410cd1cd9ba74236c1875ce5b7fecc6020c1bb0dda14f5aedb9c75b435432423a6fe51eb1d
+DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
+EBUILD libcec-4.0.4-r1.ebuild 2022 BLAKE2B 2088e3e67a7476b6f2351be8ea588b6f9e100311c9fc1a8148b8bdca8a4a6984abb7e3f07035dee2a63cfa7a9a0b2185121128bce49770d9d05ac9b661d77079 SHA512 a0edd244262f2346b827abb1515a3e647ae5f79fa2d865beb68c8e4ede11a02d2ef1aab3985af6278b3935c7948145fb7fc08c3b9c9c269c18c863f70a927e38
+EBUILD libcec-4.0.7.ebuild 3275 BLAKE2B bc8eda27105cbe1b134192416b5cca696559de6c8268eb3ce6e98ccb0945a564791081a00dccfdf33fc1758c9d704e80b8296b84a0108662b0ffd608e6af823d SHA512 c55459f1615341301a8b5ea8df8c98e3960726160bb4074e92d2289b0f538b30dac461fb27864fcf7e021266376308a611e4ff3ff57f030dacdf8ed08df9c9fc
+EBUILD libcec-6.0.2.ebuild 3271 BLAKE2B cf6e8bfbab9cfce561660002a9ead81a11792839cf68a3e94f6b62a0d9f9eba17fa12a9f878f39ac55114f6f25599be8f984dfc955377f656e29fd16ae1ab64c SHA512 39911b7928f231eea45e14d1288d8d74124aca144c2c347c1b1ee3a8c2cecb0355bf5ac19824f8d7c85d7f4e4ab7352f04d9f147417e7180edfbc58c55ba8bc6
 MISC metadata.xml 911 BLAKE2B a1c97593e181f44ae3c90ba70e8d36344272663b3d7090ca9b2716df532903ec821009321b0183dfa82b6c881349f559216ff040ed1f45e78c214c8601ab67d1 SHA512 7c5dd62ea6d854fdc4e7083487e141c703543d7220ca98fb9431279080ead371a42ee386d1c015dbfc3ea96e183cf4b8f810d8a6a5791d58aca4b3cdb38a7dab
diff --git a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
deleted file mode 100644
index 673c6f86c972..000000000000
--- a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
-+++ libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
-@@ -27,8 +27,12 @@ set(cecclient_SOURCES cec-client.cpp)
- check_library_exists(curses initscr "" HAVE_CURSES_API)
- if (HAVE_CURSES_API)
-   list(APPEND cecclient_SOURCES curses/CursesControl.cpp)
-+
-+  # tinfo
-+  find_library(HAVE_CURSES_TINFO tinfo)
- endif()
- 
-+
- add_executable(cec-client ${cecclient_SOURCES})
- set_target_properties(cec-client PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH})
- target_link_libraries(cec-client ${p8-platform_LIBRARIES})
-@@ -44,6 +48,9 @@ if (NOT WIN32)
-   # curses
-   if (HAVE_CURSES_API)
-     target_link_libraries(cec-client curses)
-+    if (HAVE_CURSES_TINFO)
-+      target_link_libraries(cec-client tinfo)
-+    endif()
-   endif()
- 
-   # rt
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
deleted file mode 100644
index 7a242dcd5187..000000000000
--- a/dev-libs/libcec/libcec-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
-HOMEPAGE="http://libcec.pulse-eight.com"
-SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cubox exynos python raspberry-pi +xrandr"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="virtual/udev
-	>=dev-libs/libplatform-2.0.0
-	sys-libs/ncurses:=
-	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
-	xrandr? ( x11-libs/libXrandr )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~USB_ACM"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-no-tinfo.patch" )
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Do not hardcode the python libpath #577612
-	sed -i \
-		-e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
-		src/libcec/cmake/CheckPlatformSupport.cmake || die
-
-	use python || cmake_comment_add_subdirectory "src/pyCecClient"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKIP_PYTHON_WRAPPER=$(usex !python)
-		-DHAVE_EXYNOS_API=$(usex exynos)
-		-DHAVE_TDA995X_API=$(usex cubox)
-		-DHAVE_RPI_API=$(usex raspberry-pi)
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_SITEDIR="$(python_get_sitedir)"
-	)
-
-	# 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-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "You will need to ensure the user running your CEC client has"
-	elog "read/write access to the device. You can ensure this by adding"
-	elog "them to the uucp group"
-}
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index d89298c497b1..4f1dbb82397b 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
+inherit cmake linux-info python-single-r1 toolchain-funcs
 
 DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
 HOMEPAGE="http://libcec.pulse-eight.com"
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Do not hardcode the python libpath #577612
 	sed -i \
@@ -68,7 +68,7 @@ src_configure() {
 		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libcec/libcec-4.0.7.ebuild b/dev-libs/libcec/libcec-4.0.7.ebuild
index 67a73ca791e6..55442c3f1e34 100644
--- a/dev-libs/libcec/libcec-4.0.7.ebuild
+++ b/dev-libs/libcec/libcec-4.0.7.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
-inherit cmake-utils linux-info python-single-r1 toolchain-funcs
+inherit cmake linux-info python-single-r1 toolchain-funcs
 
 DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
 HOMEPAGE="http://libcec.pulse-eight.com"
@@ -51,7 +51,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Do not hardcode the python libpath #577612
 	sed -i \
@@ -91,19 +91,20 @@ src_configure() {
 		-DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
-	use udev && \
+	if use udev; then
 		cp "${S}/debian/pulse-eight-usb-cec.udev" \
 			"${BUILD_DIR}/65-pulse-eight-usb-cec.udev" || die
+	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	use python && python_optimize "${D}$(python_get_sitedir)"
 
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
new file mode 100644
index 000000000000..9ffaf6366ec5
--- /dev/null
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+MY_PV=${PV/_p/-}
+MY_P=${PN}-${MY_PV}
+
+inherit cmake linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor"
+HOMEPAGE="http://libcec.pulse-eight.com"
+SRC_URI="https://github.com/Pulse-Eight/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cubox exynos python raspberry-pi kernel-cec tools +xrandr udev"
+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 )
+	tools? ( sys-libs/ncurses:= )
+	udev? ( virtual/udev )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~USB_ACM"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.7-no-override-udev.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"
+
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_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"
+
+	if ! use tools; then
+		cmake_comment_add_subdirectory "src/cec-client"
+		cmake_comment_add_subdirectory "src/cecc-client"
+		sed -i -Ee 's|add_dependencies\(cecc?-client cec\)|#DO NOT BUILD \0|' \
+			CMakeLists.txt || die
+	fi
+}
+
+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)
+	)
+
+	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
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use udev ; then
+		cp "${S}/debian/pulse-eight-usb-cec.udev" \
+			"${BUILD_DIR}/65-pulse-eight-usb-cec.udev" || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	use python && python_optimize "${D}$(python_get_sitedir)"
+
+	use tools && doman debian/cec-client.1
+
+	if use udev; then
+		insinto /lib/udev/rules.d
+		doins "${BUILD_DIR}/65-pulse-eight-usb-cec.udev"
+	fi
+}
+
+pkg_postinst() {
+	elog "You will need to ensure the user running your CEC client has"
+	elog "read/write access to the device. You can ensure this by adding"
+	elog "them to the uucp group"
+}