From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1373364-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BFE5515808B
for <garchives@archives.gentoo.org>; Tue, 8 Mar 2022 13:31:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F0BBCE0828;
Tue, 8 Mar 2022 13:31:12 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AD455E0828
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Mar 2022 13:31:12 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B6B78342C10
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Mar 2022 13:31:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B6F93315
for <gentoo-commits@lists.gentoo.org>; Tue, 8 Mar 2022 13:31:08 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1646746249.59021c0fed10204dc8ea7aaaca6b99b6d26e083e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/pulseaudio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild media-sound/pulseaudio/pulseaudio-15.99.1.ebuild
X-VCS-Directories: media-sound/pulseaudio/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 59021c0fed10204dc8ea7aaaca6b99b6d26e083e
X-VCS-Branch: master
Date: Tue, 8 Mar 2022 13:31:08 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: be9b6f68-a1fd-4154-a0e4-5fcc4203b688
X-Archives-Hash: 376a42340bce23d0e0b3afd7a57a1e48
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}"