From d305208ca7a258fb77809f63c895764345c61919 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 27 Jul 2022 09:01:23 +0100
Subject: gentoo auto-resync : 27:07:2022 - 09:01:23

---
 media-sound/cadence/Manifest                |  4 +-
 media-sound/cadence/cadence-0.9.2-r1.ebuild | 97 +++++++++++++++++++++++++++++
 media-sound/cadence/cadence-0.9.2.ebuild    | 92 ---------------------------
 media-sound/cadence/cadence-9999.ebuild     |  9 ++-
 4 files changed, 106 insertions(+), 96 deletions(-)
 create mode 100644 media-sound/cadence/cadence-0.9.2-r1.ebuild
 delete mode 100644 media-sound/cadence/cadence-0.9.2.ebuild

(limited to 'media-sound/cadence')

diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index bc9b0908abf3..d54ababf92dc 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
-EBUILD cadence-0.9.2.ebuild 2434 BLAKE2B 0ae7d58942830a368ec7102708adad2bf729b24b0b737a298528d878de91af3323aba5a604d9c6be68d7fc71cd2b9609cd75f945f91bb8146335fd2941292606 SHA512 2c11f655b1c4a36058446490f1fdb72f4e6e651f59adf0b5dc5085ee1115cf9d47fbcb530a8c9eec50c1cd896955ddbc4234d7c4ea773c38c6894e3cc3fe7237
-EBUILD cadence-9999.ebuild 2435 BLAKE2B 69f1d663fd990ff5bc56233d40178674711e769c29962723706b2dacfc0761a59d1af76b771639fb9a5c6e0bc5797166b117349797d164f355507a8883405320 SHA512 77f12ae78c79de7d3ada83208c1b069ec2d0161a38a0f3d06ff0eb8a793a29f5b86a84147da1940cc2d854b4ebbde8944e55ce4504df5c668f16be7ed7797207
+EBUILD cadence-0.9.2-r1.ebuild 2478 BLAKE2B 464fe50efe511c2a55def5fd639fbda7c3cdd567533070f7c39b5d38a740c548938efb353ff0a50faba676e5e9579b56440753db1968174be05792995f55ea0b SHA512 fcc44c66e6bb2e708cabd2d9922184c1d7a247cf489e9679043013fb7103a6fc354489b2c20c6b9bff9abc621a66f726643a3011847bf0d5d982b23e8d972e27
+EBUILD cadence-9999.ebuild 2479 BLAKE2B 5944ca8f19717467515ae044e624b3af3e0072d75535c84c7b22fb803d474c0d73480a72611819fb2536d3c1d8baeaeeb422a4dc0aac64297c7a19e98b8fa9fc SHA512 2e26d653a658d8e14cf9c205121fd5fd0679cd03cb33d72921090603e5909355ceb28188bcc713990cf51f11bfad5f27b7cd6a9dc3c796c036a8719304ea413c
 MISC metadata.xml 480 BLAKE2B 249a8627c9afd2ce1bbb84e967b30cd1226c5cc8a27fa6ad354effe873a0d9d05a6704782bf9226698c3bfeb3f4cfcee5e6f055d19bcca8767518cfa526a2df0 SHA512 b44afd279ba116b4c1111b9503d35ef44611f693cea1a69abd6510d6f2381e0500ef7c243bb49657d80da403e6a641a7573f25fb5cccccf4774569426671e6b2
diff --git a/media-sound/cadence/cadence-0.9.2-r1.ebuild b/media-sound/cadence/cadence-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..f67d9bb389fa
--- /dev/null
+++ b/media-sound/cadence/cadence-0.9.2-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-single-r1 xdg desktop
+
+DESCRIPTION="Collection of tools useful for audio production"
+HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
+else
+	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64"
+	S="${WORKDIR}/Cadence-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="a2jmidid pulseaudio opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+	')
+	media-sound/jack_capture
+	virtual/jack
+	a2jmidid? ( media-sound/a2jmidid[dbus] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio-daemon[jack]
+			media-video/pipewire[jack-sdk]
+			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
+		)
+	)"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
+)
+
+src_prepare() {
+	sed -i -e "s/python3/${EPYTHON}/" \
+		data/cadence \
+		data/cadence-aloop-daemon \
+		data/cadence-jacksettings \
+		data/cadence-logs \
+		data/cadence-render \
+		data/cadence-session-start \
+		data/catarina \
+		data/catia \
+		data/claudia \
+		data/claudia-launcher || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	myemakeargs=(PREFIX="${EPREFIX}/usr"
+		SKIP_STRIPPING=true
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
+
+	python_fix_shebang "${ED}"
+
+	# Clean up stuff that shouldn't be installed
+	rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
+	rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop
+	rm -rf "${ED}"/usr/share/applications/*.desktop
+
+	if use !pulseaudio; then
+		rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback}
+		rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback}
+	fi
+	# Depend on ladish which is not in the tree
+	rm -rf "${ED}"/usr/bin/claudia{,-launcher}
+	rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/
+
+	# Replace desktop entries with QA issues with these
+	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
+}
diff --git a/media-sound/cadence/cadence-0.9.2.ebuild b/media-sound/cadence/cadence-0.9.2.ebuild
deleted file mode 100644
index 9d733c2e63b2..000000000000
--- a/media-sound/cadence/cadence-0.9.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit python-single-r1 xdg desktop
-
-DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/falkTX/Cadence.git"
-else
-	SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64"
-	S="${WORKDIR}/Cadence-${PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="a2jmidid pulseaudio opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
-	')
-	media-sound/jack_capture
-	virtual/jack
-	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-fix-clang.patch
-)
-
-src_prepare() {
-	sed -i -e "s/python3/${EPYTHON}/" \
-		data/cadence \
-		data/cadence-aloop-daemon \
-		data/cadence-jacksettings \
-		data/cadence-logs \
-		data/cadence-render \
-		data/cadence-session-start \
-		data/catarina \
-		data/catia \
-		data/claudia \
-		data/claudia-launcher || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	myemakeargs=(PREFIX="${EPREFIX}/usr"
-		SKIP_STRIPPING=true
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
-
-	python_fix_shebang "${ED}"
-
-	# Clean up stuff that shouldn't be installed
-	rm -rf "${ED}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
-	rm -rf "${ED}"/etc/xdg/autostart/cadence-session-start.desktop
-	rm -rf "${ED}"/usr/share/applications/*.desktop
-
-	if use !pulseaudio; then
-		rm -rf "${ED}"/usr/bin/cadence-pulse2{jack,loopback}
-		rm -rf "${ED}"/usr/share/cadence/pulse2{jack, loopback}
-	fi
-	# Depend on ladish which is not in the tree
-	rm -rf "${ED}"/usr/bin/claudia{,-launcher}
-	rm -rf "${ED}"/usr/share/cadence/icons/claudia-hicolor/
-
-	# Replace desktop entries with QA issues with these
-	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
-	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
-	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
-}
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 826035d06617..98dadcb280cd 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -34,8 +34,13 @@ CDEPEND="
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
-"
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio-daemon[jack]
+			media-video/pipewire[jack-sdk]
+			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
+		)
+	)"
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
-- 
cgit v1.2.3