From 5469f74f2b8df610090de7e2c9535b9594712ac6 Mon Sep 17 00:00:00 2001
From: audiodef <audiodef11@gmail.com>
Date: Wed, 15 Feb 2023 19:23:23 -0500
Subject: [PATCH] media-sound/ladish: Updated with files from nedko's repo

---
 ...adish-1-r2.ebuild => ladish-1.9999.ebuild} | 47 ++++++-----
 media-sound/ladish/ladish-9999.ebuild         | 78 +++++++++++++++++++
 media-sound/ladish/metadata.xml               |  4 +-
 3 files changed, 109 insertions(+), 20 deletions(-)
 rename media-sound/ladish/{ladish-1-r2.ebuild => ladish-1.9999.ebuild} (57%)
 create mode 100644 media-sound/ladish/ladish-9999.ebuild

diff --git a/media-sound/ladish/ladish-1-r2.ebuild b/media-sound/ladish/ladish-1.9999.ebuild
similarity index 57%
rename from media-sound/ladish/ladish-1-r2.ebuild
rename to media-sound/ladish/ladish-1.9999.ebuild
index 40401a2..2589a49 100644
--- a/media-sound/ladish/ladish-1-r2.ebuild
+++ b/media-sound/ladish/ladish-1.9999.ebuild
@@ -1,53 +1,55 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9,10,11} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit flag-o-matic python-single-r1 waf-utils
+inherit flag-o-matic python-single-r1 waf-utils xdg-utils
 
 DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
 HOMEPAGE="https://ladish.org"
-inherit vcs-snapshot
-SRC_URI="https://github.com/LADI/ladish/archive/${P}.tar.gz
-	https://git.nedk.org/lad/ladish.git/plain/waf?id=f15b80e6394ba0cbb4b76aa1b32071bfb971a8fa -> ${P}-waf-2.0.22"
-KEYWORDS="~amd64"
+inherit git-r3
+EGIT_REPO_URI="https://github.com/LADI/ladish.git"
+EGIT_BRANCH="1-stable"
+EGIT_COMMIT=f10cf1598359c2184cfc1b27fa7be4f5fb767833
+KEYWORDS=""
+EGIT_SUBMODULES=()
+
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT="mirror"
 
-IUSE="debug doc lash"
+IUSE="debug doc lash gtk"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="media-libs/alsa-lib
-	media-sound/jack2[dbus]
+	media-sound/jackdbus
 	sys-apps/dbus
 	dev-libs/expat
 	lash? ( !media-sound/lash )
+	gtk? (
+		dev-libs/glib
+		dev-libs/dbus-glib
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		>=dev-cpp/libgnomecanvasmm-2.6.0
+	)
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
+	>=media-sound/jack2-2.21.0
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS README NEWS )
 
 PATCHES=(
-	"${FILESDIR}/${P}-python3.patch"
-	"${FILESDIR}/${P}-disable-gladish.patch"
-	"${FILESDIR}/${P}-configure-libdir.patch"
-	"${FILESDIR}/${P}-add-includes-for-getrlimit.patch"
 )
 
 src_prepare()
 {
-	sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
 	append-cxxflags '-std=c++11'
-
-	cp "${DISTDIR}/ladish-1-waf-2.0.22" ./waf || die
-	chmod +x ./waf || die
-
 	default
 }
 
@@ -56,6 +58,7 @@ src_configure() {
 		--distnodeps
 		$(usex debug --debug '')
 		$(usex doc --doxygen '')
+		$(usex gtk '--enable-gladish' '')
 		$(usex lash '--enable-liblash' '')
 	)
 	waf-utils_src_configure "${mywafconfargs[@]}"
@@ -66,3 +69,11 @@ src_install() {
 	waf-utils_src_install
 	python_fix_shebang "${ED}"
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/ladish/ladish-9999.ebuild b/media-sound/ladish/ladish-9999.ebuild
new file mode 100644
index 0000000..02bb472
--- /dev/null
+++ b/media-sound/ladish/ladish-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10,11} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-single-r1 waf-utils xdg-utils
+
+DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
+HOMEPAGE="https://ladish.org"
+inherit git-r3
+EGIT_REPO_URI="https://github.com/LADI/ladish.git"
+EGIT_BRANCH="main"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
+EGIT_SUBMODULES=()
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="mirror"
+
+IUSE="debug doc lash gtk"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jackdbus
+	sys-apps/dbus
+	dev-libs/expat
+	lash? ( !media-sound/lash )
+	gtk? (
+		dev-libs/glib
+		dev-libs/dbus-glib
+		x11-libs/gtk+:2
+		dev-cpp/gtkmm:2.4
+		>=dev-cpp/libgnomecanvasmm-2.6.0
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	>=media-sound/jack2-2.21.0
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README NEWS )
+
+PATCHES=(
+)
+
+src_prepare()
+{
+	append-cxxflags '-std=c++11'
+	default
+}
+
+src_configure() {
+	local -a mywafconfargs=(
+		--distnodeps
+		$(usex debug --debug '')
+		$(usex doc --doxygen '')
+		$(usex gtk '--enable-gladish' '')
+		$(usex lash '--enable-liblash' '')
+	)
+	waf-utils_src_configure "${mywafconfargs[@]}"
+}
+
+src_install() {
+	use doc && HTML_DOCS="${S}/build/default/html/*"
+	waf-utils_src_install
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/ladish/metadata.xml b/media-sound/ladish/metadata.xml
index 0f4363a..21c5a37 100644
--- a/media-sound/ladish/metadata.xml
+++ b/media-sound/ladish/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>webmaster@gentoostudio.org</email>
-		<name>Audiodef/Damien Moody</name>
+		<email>nedko@nedk.org</email>
+		<name>Nedko Arnaudov</name>
 	</maintainer>
 </pkgmetadata>