commit:     59021c0fed10204dc8ea7aaaca6b99b6d26e083e
Author:     Igor V. Kovalenko <igor.v.kovalenko <AT> gmail <DOT> com>
AuthorDate: Sun Feb 27 07:31:41 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar  8 13:30:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59021c0f

media-sound/pulseaudio: Clean up split build IUSE and deps on meta.

Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24357
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pulseaudio/pulseaudio-15.99.1-r1.ebuild        | 26 ++++++++++++++
 media-sound/pulseaudio/pulseaudio-15.99.1.ebuild   | 40 ----------------------
 2 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild 
b/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
new file mode 100644
index 000000000000..cd33ef88feb7
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/";
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+
+LICENSE="metapackage"
+
+SLOT="0"
+
+IUSE="+daemon +glib"
+
+RDEPEND="
+       >=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
+       daemon? ( >=media-sound/pulseaudio-daemon-${PV} )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"

diff --git a/media-sound/pulseaudio/pulseaudio-15.99.1.ebuild 
b/media-sound/pulseaudio/pulseaudio-15.99.1.ebuild
deleted file mode 100644
index 787bcfa92ef1..000000000000
--- a/media-sound/pulseaudio/pulseaudio-15.99.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/";
-SRC_URI=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
-
-LICENSE="metapackage"
-
-SLOT="0"
-
-IUSE="+alsa +alsa-plugin bluetooth +daemon +glib jack zeroconf"
-
-# TODO: Get rid of the REQUIRED_USE by adapting the consumers to the splits 
with correct USE deps and dropping IUSE here
-REQUIRED_USE="
-       !daemon? (
-               !alsa
-               !alsa-plugin
-               !bluetooth
-               !jack
-               !zeroconf
-       )
-"
-
-RDEPEND="
-       >=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
-       daemon? ( 
>=media-sound/pulseaudio-daemon-${PV}[alsa?,bluetooth?,jack?,zeroconf?] )
-"
-DEPEND="${RDEPEND}"
-# TODO: Figure out alsa-plugin handling, where pulseaudio-daemon isn't a 
multilib-minimal package
-PDEPEND="alsa? ( alsa-plugin? ( 
>=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )"
-BDEPEND=""
-
-S="${WORKDIR}"

Reply via email to