From 706677fb2d95aa5124e720c65e5d1c5b7fa1eb2e Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@nedk.org>
Date: Wed, 19 Apr 2023 17:13:24 +0300
Subject: [PATCH] jack2,jackdbus,ladish: keep source tree clean unless patched

---
 media-sound/jack2/jack2-2.9999.ebuild       |  7 -------
 media-sound/jackdbus/jackdbus-2.22.1.ebuild |  1 -
 media-sound/jackdbus/jackdbus-2.9999.ebuild | 21 +++++----------------
 media-sound/ladish/ladish-1-r3.ebuild       |  1 -
 media-sound/ladish/ladish-1.9999.ebuild     |  1 -
 media-sound/ladish/ladish-9999.ebuild       |  1 -
 6 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/media-sound/jack2/jack2-2.9999.ebuild b/media-sound/jack2/jack2-2.9999.ebuild
index 94c1d07..f21bb44 100644
--- a/media-sound/jack2/jack2-2.9999.ebuild
+++ b/media-sound/jack2/jack2-2.9999.ebuild
@@ -43,13 +43,6 @@ DOCS=( AUTHORS.rst NEWS.rst README.rst README_NETJACK2 )
 
 PATCHES=( )
 
-src_prepare() {
-	default
-
-	python_fix_shebang waf
-#	copy_sources
-}
-
 src_configure() {
 	# clients crash if built with lto
 	# https://github.com/jackaudio/jack2/issues/485
diff --git a/media-sound/jackdbus/jackdbus-2.22.1.ebuild b/media-sound/jackdbus/jackdbus-2.22.1.ebuild
index edf2d5b..7941053 100644
--- a/media-sound/jackdbus/jackdbus-2.22.1.ebuild
+++ b/media-sound/jackdbus/jackdbus-2.22.1.ebuild
@@ -58,5 +58,4 @@ src_compile() {
 
 src_install() {
 	waf-utils_src_install
-	python_fix_shebang "${ED}"/usr/bin/jack_control
 }
diff --git a/media-sound/jackdbus/jackdbus-2.9999.ebuild b/media-sound/jackdbus/jackdbus-2.9999.ebuild
index 2e76fb1..a26568f 100644
--- a/media-sound/jackdbus/jackdbus-2.9999.ebuild
+++ b/media-sound/jackdbus/jackdbus-2.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="threads(+)"
-inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
+inherit flag-o-matic python-single-r1 waf-utils
 inherit git-r3
 
 EGIT_REPO_URI="https://github.com/LADI/${PN}.git"
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-	sys-apps/dbus[${MULTILIB_USEDEP}]"
+	sys-apps/dbus"
 RDEPEND="
 	${DEPEND}
 	${PYTHON_DEPS}
@@ -39,14 +39,7 @@ PDEPEND=""
 
 DOCS=( AUTHORS NEWS.rst README.adoc )
 
-src_prepare() {
-	default
-
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
+src_configure() {
 	# clients crash if built with lto
 	# https://github.com/jackaudio/jack2/issues/485
 	filter-lto
@@ -58,14 +51,10 @@ multilib_src_configure() {
 	waf-utils_src_configure "${wafargs[@]}"
 }
 
-multilib_src_compile() {
+src_compile() {
 	waf-utils_src_compile
 }
 
-multilib_src_install() {
+src_install() {
 	waf-utils_src_install
 }
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"/usr/bin/jack_control
-}
diff --git a/media-sound/ladish/ladish-1-r3.ebuild b/media-sound/ladish/ladish-1-r3.ebuild
index 4370079..73dd033 100644
--- a/media-sound/ladish/ladish-1-r3.ebuild
+++ b/media-sound/ladish/ladish-1-r3.ebuild
@@ -67,7 +67,6 @@ src_configure() {
 src_install() {
 	use doc && HTML_DOCS="${S}/build/default/html/*"
 	waf-utils_src_install
-	python_fix_shebang "${ED}"
 }
 
 pkg_postinst() {
diff --git a/media-sound/ladish/ladish-1.9999.ebuild b/media-sound/ladish/ladish-1.9999.ebuild
index cf21453..88b5993 100644
--- a/media-sound/ladish/ladish-1.9999.ebuild
+++ b/media-sound/ladish/ladish-1.9999.ebuild
@@ -67,7 +67,6 @@ src_configure() {
 src_install() {
 	use doc && HTML_DOCS="${S}/build/default/html/*"
 	waf-utils_src_install
-	python_fix_shebang "${ED}"
 }
 
 pkg_postinst() {
diff --git a/media-sound/ladish/ladish-9999.ebuild b/media-sound/ladish/ladish-9999.ebuild
index 255541d..9a09564 100644
--- a/media-sound/ladish/ladish-9999.ebuild
+++ b/media-sound/ladish/ladish-9999.ebuild
@@ -66,7 +66,6 @@ src_configure() {
 src_install() {
 	use doc && HTML_DOCS="${S}/build/default/html/*"
 	waf-utils_src_install
-	python_fix_shebang "${ED}"
 }
 
 pkg_postinst() {