gentoo resync : 20.03.2021

4 files changed, 2 insertions, 278 deletions

diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 461d4183b54a..3ebfeb79463f 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,9 +1,5 @@
 DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
-DIST pipewire-0.3.20.tar.gz 1228482 BLAKE2B d5c51a7da984b075d4fd2504ecc2082527807a6319a42c44b09a687112c2ba10746a2554997e8f6fa36a06cdf5b94b4099adb1f8ee986673855db6e8e0356468 SHA512 7838cafe413e5082146e39a8d2cd29ec5193da68fa76c4d2b9390cbdf06d388c5a8b76f90fadf5f7ece4a8b1b86c3765b3fa968479f3bb9e11e84be006276c1c
-DIST pipewire-0.3.21.tar.gz 1243935 BLAKE2B b736a0253e8c0af96f7bdc47684d52bc8e70d4b2310b80a1b036ae3ef30fd042e1ad641aae342f9727b3191a38cfd36794879bf54954124b99984e2841aa7373 SHA512 cd1e7696c5712dfbd0f5ebffbb74f23ce5f6752744b062741546d55d524a4dca43776e1862fdc55faf5220c23f7ef9e0c5f9c3b1892a6b43ad50dfb99b9a66cc
 DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
 EBUILD pipewire-0.3.18.ebuild 3423 BLAKE2B a17234221cb84d36eab89a48f3dfe13a910bc02c67de3ab9462ad081d115922c53928cb0896393b7ff78a99447f588fbc9a31033e6048bbfb09a204ffb8d514b SHA512 1931d14b75e0e99ef4b7ff0d661a942dab3d8d9cb90e8dc6f5d723ece66824906c474aa40af6f03ab751db0356d9a36e336ad3b1aeece6bdd38276355f0b1d1d
-EBUILD pipewire-0.3.20.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
-EBUILD pipewire-0.3.21.ebuild 3427 BLAKE2B ed91881ae1601a21ed6cd37b2f9bfe0115665fc7641556e82bb6909749897a05648deb4da277a56d4c33d984f608689b5e5a2bc2d219e8148ed87a0aefb41dfd SHA512 9d759021ed8c9e2827b2a42bce67d04346e7175792068730a4f69d25d527eda9a9e9d4c1b1ee41b80696274c007f28d089ca64954ebd956d34711da7d0f85d9c
-EBUILD pipewire-0.3.22.ebuild 3181 BLAKE2B 8e6cc3c81e908aebf9636f292dbd839c4ebe24c21b078ec28bdcd24aa5eead5e75e44e777af5716177c5dd685d4bc509ff230ce0070cd8904932a09426a164d2 SHA512 089d797a420d92a796cd9be7edc28854c43f8ddfde5466ba241bad7ffb19ecad0042e700d4264ced9b82566078b9b4d0a4136405570821b2e5c6af31f161cd67
+EBUILD pipewire-0.3.22.ebuild 3180 BLAKE2B a2c337f799010c37734af0fedd47eed02717e268c5cb2915516dc291f3d07dc70a9b97c868d1e124182fb8a27b20be7652461538e729ceda04da991e7c559ccb SHA512 732ff816b1ddaa2553c7b3d87938b38d17c10e66e0fff8674736d8e5175a4db8bf1002a12b962210bbfe8d71bd54064c17e1a4bc9e53c8b1ceb611d054855248
 MISC metadata.xml 760 BLAKE2B 7ce012dfa532fe563c70ec4782b43db76a9d2f6bdf439d0a524f59f9e8df8ea5aff513abb71d55aba5fe74277f71d7f0b20bb40182903a5d50b72bdffa3cfc9f SHA512 d3f9b3c4f80d282337c5c538680190f8b060ac28813ac6510c81c23e003c384ee3f6995e2eb5bb646e7af9d52a73a2e2c7578b313bcb11a5f86de94400c71246
diff --git a/media-video/pipewire/pipewire-0.3.20.ebuild b/media-video/pipewire/pipewire-0.3.20.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.20.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use gstreamer gstreamer-device-provider)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.21.ebuild b/media-video/pipewire/pipewire-0.3.21.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.21.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
-	EGIT_BRANCH="work"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
-	app-doc/xmltoman
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	>=media-libs/alsa-lib-1.1.7
-	media-libs/libsdl2
-	>=media-libs/libsndfile-1.0.20
-	sys-apps/dbus
-	virtual/libudev
-	bluetooth? (
-		media-libs/sbc
-		net-wireless/bluez:=
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack? ( >=media-sound/jack2-1.9.10:2 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-11.1
-	)
-	systemd? ( sys-apps/systemd )
-	vulkan? ( media-libs/vulkan-loader )
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	spa_use() {
-		if ! in_iuse ${1} || ! use ${1}; then
-			sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
-				-i src/daemon/pipewire.conf.in || die
-		fi
-	}
-
-	default
-	spa_use libcamera
-	spa_use rtkit
-	spa_use bluetooth bluez5
-	spa_use jack
-	spa_use vulkan
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dexamples=true # contains required pipewire-media-session
-		-Dman=true
-		-Dspa-plugins=true
-		--buildtype=$(usex debug debugoptimized plain)
-		# alsa plugin and jack/pulseaudio emulation
-		-Dpipewire-alsa=true
-		$(meson_use jack pipewire-jack)
-		$(meson_use pulseaudio pipewire-pulseaudio)
-		# spa-plugins
-		# we install alsa support unconditionally
-		$(meson_use bluetooth bluez5)
-		$(meson_use ffmpeg)
-		$(meson_use jack)
-		$(meson_use vulkan)
-		# libcamera is not packaged
-		# misc
-		$(meson_use doc docs)
-		$(meson_use gstreamer)
-		$(meson_use gstreamer gstreamer-device-provider)
-		$(meson_use systemd)
-		$(meson_use test test)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# 	# TODO: this breaks alsa users
-# 	if use alsa; then
-# 		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# 	fi
-}
-
-pkg_postinst() {
-	elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
-	elog "by setting DISABLE_RTKIT env var."
-	elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
-	elog
-	if use jack; then
-		elog "Please note that even though the libraries for JACK emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace a JACK server."
-		elog
-	fi
-	if use pulseaudio; then
-		elog "Please note that even though the libraries for PulseAudio emulation have"
-		elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
-		elog
-	fi
-	elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.22.ebuild b/media-video/pipewire/pipewire-0.3.22.ebuild
index fdf60d2768fe..ca830f18aed3 100644
--- a/media-video/pipewire/pipewire-0.3.22.ebuild
+++ b/media-video/pipewire/pipewire-0.3.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"