gentoo auto-resync : 29:05:2023 - 15:17:30

5 files changed, 13 insertions, 130 deletions

diff --git a/media-video/webcamoid/Manifest b/media-video/webcamoid/Manifest
index e58d74f8bb9e..8f862b1d7534 100644
--- a/media-video/webcamoid/Manifest
+++ b/media-video/webcamoid/Manifest
@@ -1,7 +1,4 @@
-AUX webcamoid-8.7.1-gcc11.patch 469 BLAKE2B e6994f1f0bd90a83ee1a3510990ff3e31867f89da9a66ff755a60f364f4bdbbbd5e8130816329beec533a48d1517261f60f2650fa9ff45a7e1536066d8fc7d3e SHA512 ac225037ef06604d413452447d863875a10f896a396ffc0def178e3bab447f3f2357558724f00ab9128f94a8f916a4d454e9fef2915e17465d4166508f9c2012
-DIST webcamoid-8.8.0.tar.gz 8887888 BLAKE2B d0c3f0cee1fe487e8e61cb50148415899f2df8bdd1c48f1d944cece167e69fc6872cc7a45dbf441d6b4b88d0ae99c1a227339594a6ad94416b765a89eb1a70e0 SHA512 e21e3f6b7ad4f4031658033e94f377db06e06d5bad8f0540af6ac824972aa2811336d5edfef19c674e9b98d0bf9d96f22ac46623d5cb4c39bc310d248daf0bfa
 DIST webcamoid-9.0.0.tar.gz 9257331 BLAKE2B df7044650c92fd1e557043e2a721079dcc2531a59fb9859c19e02f95bd091fb33cec5e69bbc323baf8c11faad404824f875afe643e9d21085d3496a78acc04f4 SHA512 0de39dc6a5bc3fb8d6477728d971bca933c57e354a6d041389b33c3e48ec7c7912007f6f87bc9be5db303f58ddc5143bb28dc1b475c9ca361f579e1532b515a4
-EBUILD webcamoid-8.8.0.ebuild 1741 BLAKE2B f80de276c25421a4187139976551e07192f2d716750e444e66633da59621d87a72cbf26d3afce398beda4486f3900ebab6885ce4009de59c71ce1a12992dbaa0 SHA512 b03f081bb55d6279657d6b05ce7eede8476669bfaf6a2e1fbdc48ac93648fc2012b8e08cad2487057308b032a65534deb1cd5e95ebd4baf6511319bf5fa607ec
-EBUILD webcamoid-9.0.0.ebuild 2037 BLAKE2B 082af097bb6ce0aa1dc052bf549e1ddb7ffcb66ee5fbf058c4d4c0956640abd4f1cff6407ac16067aa47a71ce883e263b8aacde2798e6fb52b650609e0491bdf SHA512 dc6ff85712a6c2ca5c49ef21fc3e27bcfbedce1fcf664d2c6ea70d794c316391199ee545bd4a6d497d6d4e9e1f0f58e4022113b1fda820a0c61ec83f14369d73
-EBUILD webcamoid-9999.ebuild 2192 BLAKE2B 358450c8701a50cca99d33318f2e04599f39a65f95e11847e9ce9bace8011885709c5c1a34fe55a6491747cd2d8930f03f77e644a8a204522ce396108e6b0635 SHA512 7ba6855e8bfb5b4cd38be183b7caf15d24e59fbdffb3c1819a9ce0d8c9bbc8d32cc2f72c98fa0903bdd28920a97ec1464e04a59eb913daa8c1bad1663d54f9c6
+EBUILD webcamoid-9.0.0-r1.ebuild 1942 BLAKE2B 88c603e7ae76ac807729c680205698ec7eafb25dfe3b79c52c6d5d5c000b32d5ecedaa0aa4f2473083226b52e3819659ee74807a61420d7c8b5b754cf8216645 SHA512 1dc39423350cf0cbcfefa98fab112715375d53946c2e448c88df900a5ac1849c5df2abde8c6677c2263caabfd90716a7b18a491e82b2903bee925ae730d9c8b7
+EBUILD webcamoid-9999.ebuild 2097 BLAKE2B d625e52623bac58cdbac9dc46ba75d7caa5aa795121334cee87562aecc3f3e6b66a7a46db4b0f93ed7a22f1674778aedc50e5ce6947c7e03f6e067bdd88d70d6 SHA512 de1d51e7c404060d36c9a2cb2bf198c463cc7a947ec13c927d7315281f3c5ce1cc83607d4f52bac247885d2186dfae1dff6b84aa9af26585b909121e3e2a3945
 MISC metadata.xml 586 BLAKE2B 55df36c3b4fd6319354c699e5e789b47dfd6f223068721ae842cdfae1dd158b3765e5796deabe8ca63a50da450f541e37f194c8665c7a7a1a6c2272677159d5d SHA512 729ba6c451fcc437d71c0c379179913b22e169368695daaf3452313d061641d647697f47a76684fd4bfcac318c5c7126a5214d5e0e1474c6685cbbc29fd8d0e8
diff --git a/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch b/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch
deleted file mode 100644
index d228210a19ee..000000000000
--- a/media-video/webcamoid/files/webcamoid-8.7.1-gcc11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp b/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp
-index 2a32732..5175d1d 100644
---- a/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp
-+++ b/libAvKys/Plugins/VirtualCamera/src/VCamUtils/src/image/videoformat.cpp
-@@ -19,6 +19,7 @@
- 
- #include <map>
- #include <algorithm>
-+#include <limits>
- 
- #include "videoformat.h"
- #include "../utils.h"
diff --git a/media-video/webcamoid/webcamoid-8.8.0.ebuild b/media-video/webcamoid/webcamoid-8.8.0.ebuild
deleted file mode 100644
index 80cf1db81110..000000000000
--- a/media-video/webcamoid/webcamoid-8.8.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="A full featured webcam capture application"
-HOMEPAGE="https://webcamoid.github.io"
-SRC_URI="https://github.com/webcamoid/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE_AVKYS=( alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects )
-IUSE="${IUSE_AVKYS[@]} debug headers v4l"
-
-REQUIRED_USE="v4lutils? ( v4l )"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	ffmpeg?	( media-video/ffmpeg:= )
-	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
-	jack? ( virtual/jack )
-	libuvc? ( media-libs/libuvc )
-	pulseaudio? ( media-sound/pulseaudio )
-	qtaudio? ( dev-qt/qtmultimedia:5 )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-3.6
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.7.1-gcc11.patch
-)
-
-src_configure() {
-	local myqmakeargs=(
-		"CONFIG+=debug"
-		"PREFIX=/usr"
-		"BUILDDOCS=0"
-		"INSTALLDEVHEADERS=$(usex headers 1 0)"
-		"INSTALLQMLDIR=$(qt5_get_libdir)/qt5/qml"
-		"LIBDIR=/usr/$(get_libdir)"
-		"NOAVFOUNDATION=1"
-		"NODSHOW=1"
-		"NOVCAMWIN=1"
-		"NOWASAPI=1"
-	)
-
-	use v4l || myqmakeargs+=( "NOV4L2=1" )
-
-	local x
-	for x in ${IUSE_AVKYS[@]}; do
-		use ${x} || myqmakeargs+=( "NO${x^^}=1" )
-	done
-
-	eqmake5 ${myqmakeargs[@]}
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/webcamoid/webcamoid-9.0.0.ebuild b/media-video/webcamoid/webcamoid-9.0.0-r1.ebuild
index f7d94e34ed8e..a836fa4160b7 100644
--- a/media-video/webcamoid/webcamoid-9.0.0.ebuild
+++ b/media-video/webcamoid/webcamoid-9.0.0-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
-DESCRIPTION="A full featured webcam capture application"
+DESCRIPTION="Full featured webcam capture application"
 HOMEPAGE="https://webcamoid.github.io"
 SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-
 IUSE="alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l"
 
 REQUIRED_USE="v4lutils? ( v4l )"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
 	jack? ( virtual/jack )
 	libuvc? ( media-libs/libuvc )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	qtaudio? ( dev-qt/qtmultimedia:5 )
 	v4l? ( media-libs/libv4l )
 "
@@ -71,11 +71,3 @@ src_install() {
 	docompress -x /usr/share/man/${PN}.1.gz
 	cmake_src_install
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/webcamoid/webcamoid-9999.ebuild b/media-video/webcamoid/webcamoid-9999.ebuild
index c1ebeeeecd04..1459f4bc426a 100644
--- a/media-video/webcamoid/webcamoid-9999.ebuild
+++ b/media-video/webcamoid/webcamoid-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake xdg-utils
+inherit cmake xdg
 
-DESCRIPTION="A full featured webcam capture application"
+DESCRIPTION="Full featured webcam capture application"
 HOMEPAGE="https://webcamoid.github.io"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/webcamoid/webcamoid.git"
@@ -15,13 +15,13 @@ else
 	SRC_URI="https://github.com/webcamoid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
-RESTRICT="mirror"
+
 LICENSE="GPL-3"
 SLOT="0"
-
 IUSE="alsa coreaudio ffmpeg gstreamer jack libuvc oss pulseaudio qtaudio v4lutils videoeffects debug headers v4l"
 
 REQUIRED_USE="v4lutils? ( v4l )"
+RESTRICT="mirror"
 
 COMMON_DEPEND="
 	dev-qt/qtconcurrent:5
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	gstreamer? ( >=media-libs/gstreamer-1.6.0 )
 	jack? ( virtual/jack )
 	libuvc? ( media-libs/libuvc )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	qtaudio? ( dev-qt/qtmultimedia:5 )
 	v4l? ( media-libs/libv4l )
 "
@@ -78,11 +78,3 @@ src_install() {
 	docompress -x /usr/share/man1/${PN}.1.gz
 	cmake_src_install
 }
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}