[proaudio] proaudio/proaudio: [3207] ladish: remove ladish-1-r1.ebuild; fix ladish-9999 to use nedk version and py3

[subversion@xxxxxxxxxxxxx]

Revision: 3207
Author:   dominique
Date:     2021-02-22 14:24:47 +0100 (Mon, 22 Feb 2021)
Log Message:
-----------
ladish: remove ladish-1-r1.ebuild; fix ladish-9999 to use nedk version and py3

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ladish/Manifest
    trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/ladish/files/
    trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild

Modified: trunk/overlays/proaudio/media-sound/ladish/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/Manifest	2021-01-22 01:58:15 UTC (rev 3206)
+++ trunk/overlays/proaudio/media-sound/ladish/Manifest	2021-02-22 13:24:47 UTC (rev 3207)
@@ -1,9 +1,2 @@
-AUX ladish-1-add-includes-for-getrlimit.patch 612 BLAKE2B 249120238c8e485d09f98a6d81f0f6dd432fdd223e39f59f6af84844f5987f1618f457bd8e8bc95d3f1df08521b0a31174b9ccf3d3b2e701055f9971fe4872b1 SHA512 82956d30e2a88a9b6b29f44409b5b52c9585f8403a418432c332700505edb5cada9135891908e0d529ac69357988fd04f285dd402886852b4386efd54b7332c0
-AUX ladish-1-configure-libdir.patch 1114 BLAKE2B 576768236b361e4e5ba1c0964e72df8d50e25f08993464244ac735d0b5961625961d113d5cbaadf2a0cbb6c2b30c66e6c609933e93f1ec7ede15e09d4ab9dcec SHA512 964cd77a1cfb8630759b38f5d0d6ab725e2125bbb723b0c6168721c89e7262b53cc4f6e5a3845aea4ca56dace35a33f2e8f81b95cc5e51e0a9d63807bc019dce
-AUX ladish-1-gui-resources-only-when-enabled.patch 2398 BLAKE2B 03ef6dd7530c0d38cbcb8c2a2f0363c94632e43a751c7e68851d2d7c227b176c1a18fc432089bf479ead486a835100dfb49335d2d2b34b4db3429164de50a3c0 SHA512 0cfa33298fc0bd95fc30f81199f0b20b4312c4d8d8fef8bf6dcc2d2edd95943c2126b71eb403938e430de17b0dc3a4b91081bd77dfb3ebb25ad7127803531a5b
-AUX ladish-9999-gui-resources-only-when-enabled.patch 2388 BLAKE2B 713ec8fbf794059c5917069c57e365b719e98554429b819ce1ba49fcd246fd92becd68c2c45c404a719ee31397169737ca946f49dbe7905b9d9be61ba9cc0aeb SHA512 2696381dca91248b9c514cd6d32aca457889f007046bc9332e1eb4c0c5fa4d15eb3060a37173d3415d2560e2ac6abe6811d750e18d739b5e047ff72888167769
-AUX ladish-configure-gladish.patch 1243 BLAKE2B ad3d5cc234d385241b8fc166e09c845fd6483af94d2b1a5797d922c5d8b986664a36da1597dd0d13a8a0666f1a12fe1d20853a7c8a795ee31e390861e6e66a38 SHA512 4221d2fa01d08538f0dfb785e8eb1b964f30a32b03397b09241cc9cec7bdea6b0b860c931ebdc292b1eb3b17c4dbb1d224e05a67c2009241d5dc9e29081df0ad
-DIST ladish-1.tar.gz 686288 BLAKE2B 7a3a39cf259ef57232dda50664dc4d9c57ae6f8e501d03a2d286e00451c2f99ba3130492e36132b127a868461c6a1518286d721224610060752fa5eb0b9b4cc1 SHA512 b01e24cd79c2711139c9d46c9bff4687049c3a735562a7f48a387103eec25c0222e935b90fb4eb2d3fc24629e417dab0c5aac215cbbca659ac49a2e802d1fd10
-EBUILD ladish-1-r1.ebuild 1632 BLAKE2B 4120e8277d07a96a5b15d94dc0b7e4360ba1998e59d629f0b4688dac8e3e44b9d0e2af795607dfafd050e6ce9508899bd1a60542463129da9202b17d55f8fe0b SHA512 3aa198fc7e87a8b68c1609dbebb75d2d387e2dc224404dea39e6ba1aeddc4aad48107dce63f7aecb313d9d6b063f517901740e653bdf585e165a0d8f8916cb45
-EBUILD ladish-9999.ebuild 1529 BLAKE2B 790f7452b98e43c8900d76eda5371e25ad854ba30de71bda067c91802313bb960fbd7f30ec0d0cb26164b868fb39a18238822c9b177fbdc06592c7285f56c306 SHA512 31dd0ab776a104490d222ba81ec83c059029c4410d5d400a9b9acbd80754c3c444807728d037a618e86e736f4a4539f5e39fd2ddaa6c7c5127d4e9a2425e427e
+EBUILD ladish-9999.ebuild 1549 BLAKE2B 266e034de035b42928c42d18b445c994a250d09e2a93da720bb44f976a6ceaf9e6175269e7c50de2f293388ad62d120b236c53af187ad78d1ccdc82a888252be SHA512 958e88532637756ab9833357d127ac3343357b1620a45d410ba24d25d5a714376abc2f28fd29028bb79d61ea0c0fcb0c7f40c5dc1202c35714d3ddd7061dbd76
 MISC metadata.xml 276 BLAKE2B 4c1ad52a5a99e0c98d2a4bbb13b89c7e54e576f03137606c4e63767d272f1cbd9c00386d414d08a873d3a26adfc98feed12254df4a25e12fd34c710f03e0c000 SHA512 2055795479a728df97ff1a8f70b98b4205e963424198a6de09f482f424fd563192a365fd4857452221de7502823da35cafa673c1f80fffdcade05f9c6876fbc0

Deleted: trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild	2021-01-22 01:58:15 UTC (rev 3206)
+++ trunk/overlays/proaudio/media-sound/ladish/ladish-1-r1.ebuild	2021-02-22 13:24:47 UTC (rev 3207)
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# python2_7 is dead but waf-utils need it
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic waf-utils python-single-r1
-
-DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
-HOMEPAGE="https://github.com/LADI/ladish";
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/LADI/${PN}.git";
-	KEYWORDS=""
-	EGIT_SUBMODULES=()
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/LADI/ladish/archive/${P}.tar.gz";
-	KEYWORDS="~amd64"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="mirror"
-
-IUSE="debug doc +lash -python"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	python? ( lash ) "
-
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack2[dbus]
-	sys-apps/dbus
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README NEWS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-configure-gladish.patch"
-	"${FILESDIR}/${P}-configure-libdir.patch"
-	"${FILESDIR}/${P}-add-includes-for-getrlimit.patch"
-	"${FILESDIR}/${P}-gui-resources-only-when-enabled.patch"
-)
-
-src_prepare()
-{
-	sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
-	append-cxxflags '-std=c++11'
-	default
-}
-
-src_configure() {
-	local -a mywafconfargs=(
-		--distnodeps
-		$(usex debug --debug '')
-		$(usex doc --doxygen '')
-		$(usex lash '--enable-liblash' '')
-		$(usex python '--enable-pylash' '')
-	)
-	waf-utils_src_configure "${mywafconfargs[@]}"
-}
-
-src_install() {
-	use doc && HTML_DOCS="${S}/build/default/html/*"
-	waf-utils_src_install
-#	python_fix_shebang "${ED}"
-}

Modified: trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild	2021-01-22 01:58:15 UTC (rev 3206)
+++ trunk/overlays/proaudio/media-sound/ladish/ladish-9999.ebuild	2021-02-22 13:24:47 UTC (rev 3207)
@@ -1,19 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-# python2_7 is dead
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit flag-o-matic waf-utils python-single-r1
+inherit flag-o-matic waf-utils python-single-r1 xdg-utils
 
 DESCRIPTION="LADI Session Handler - a session management system for JACK applications"
 HOMEPAGE="https://github.com/LADI/ladish";
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/LADI/${PN}.git";
+	EGIT_REPO_URI="https://git.nedk.org/lad/${PN}.git";
 	KEYWORDS=""
 	EGIT_SUBMODULES=()
 else
@@ -34,26 +33,18 @@
 	sys-apps/dbus
 	dev-libs/expat"
 DEPEND="${RDEPEND}
+	dev-cpp/gtkmm
+	dev-cpp/libgnomecanvasmm
+	x11-libs/gtk+:2
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS README NEWS )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-configure-gladish.patch"
-	"${FILESDIR}/${P}-gui-resources-only-when-enabled.patch"
-)
-
-src_prepare()
-{
-	sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
-	append-cxxflags '-std=c++11'
-	default
-}
-
 src_configure() {
 	local -a mywafconfargs=(
 		--distnodeps
+		--enable-pkg-config-dbus-service-dir
 		$(usex debug --debug '')
 		$(usex doc --doxygen '')
 		$(usex lash '--enable-liblash' '')
@@ -65,5 +56,17 @@
 src_install() {
 	use doc && HTML_DOCS="${S}/build/default/html/*"
 	waf-utils_src_install
-#	python_fix_shebang "${ED}"
+	python_fix_shebang "${ED}"
+	if use python; then
+		# fix QA warning
+		python_optimize "${ED}"
+	fi
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}