media-sound/ladish: Update live ebuild to current upstream (#551)

gentoo-audio · Aug 19, 2023 · 55b5495 · 55b5495
2 parents 1cc17ad + 8bf0356
commit 55b5495
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 55 deletions.
diff --git a/dev-libs/cdbus/Manifest b/dev-libs/cdbus/Manifest
@@ -0,0 +1 @@
+DIST cdbus-1.0_pre20230703.gh.tar.gz 169623 BLAKE2B 2fc57a83dea700d125220c0a6fd4fc4e76261f0fb3afb765233cd39bb303d31ae1e17204d47d910a8766dc223b288e44c456236ad7ee86836224107095b75391 SHA512 495b9a75d3b9615ec0b40308c707c527345b42034e7182b90cf59a4e0d72418480e667666706a3248ca5f9519606317af200e97ac2ec70d2925e829b907da9dc
diff --git a/dev-libs/cdbus/cdbus-1.0_pre20230703.ebuild b/dev-libs/cdbus/cdbus-1.0_pre20230703.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="libdbus helper library"
+HOMEPAGE="https://github.com/LADI/cdbus"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/LADI/cdbus.git"
+	EGIT_BRANCH="main"
+else
+	CDBUS_COMMIT="32cb2e2519e4088421f2de1b2d46003d1cac6d6c"
+	SRC_URI="https://github.com/LADI/cdbus/archive/${CDBUS_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${CDBUS_COMMIT}"
+fi
+
+LICENSE="GPL-2 || ( GPL-2 AFL-2.1 )"
+SLOT="0"
+
+DEPEND="
+	sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+
+	${PYTHON_DEPS}
+"
+
+src_prepare() {
+	rm -rf ".git" || die "Failed to remove git dir"
+	default
+}
+
+src_install() {
+	waf-utils_src_install
+
+	find "${ED}" \( -iname "gpl*.txt*" -o -iname "afl*.txt*" \) -delete || die
+}
diff --git a/dev-libs/cdbus/cdbus-9999.ebuild b/dev-libs/cdbus/cdbus-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+)"
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="libdbus helper library"
+HOMEPAGE="https://github.com/LADI/cdbus"
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/LADI/cdbus.git"
+	EGIT_BRANCH="main"
+else
+	CDBUS_COMMIT=""
+	SRC_URI="https://github.com/LADI/cdbus/archive/${CDBUS_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${CDBUS_COMMIT}"
+fi
+
+LICENSE="GPL-2 || ( GPL-2 AFL-2.1 )"
+SLOT="0"
+
+DEPEND="
+	sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+
+	${PYTHON_DEPS}
+"
+
+src_prepare() {
+	rm -rf ".git" || die "Failed to remove git dir"
+	default
+}
+
+src_install() {
+	waf-utils_src_install
+
+	find "${ED}" \( -iname "gpl*.txt*" -o -iname "afl*.txt*" \) -delete || die
+}
diff --git a/dev-libs/cdbus/metadata.xml b/dev-libs/cdbus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>[email protected]</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LADI/cdbus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/ladish/files/ladish-9999-disable-gladish.patch b/media-sound/ladish/files/ladish-9999-disable-gladish.patch
diff --git a/media-sound/ladish/ladish-1-r2.ebuild b/media-sound/ladish/ladish-1-r2.ebuild
@@ -13,12 +13,11 @@ HOMEPAGE="https://ladish.org"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.nedk.org/lad/ladish.git"
-	KEYWORDS=""
 	EGIT_SUBMODULES=()
 else
 	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"
+		https://gitea.ladish.org/LADI/ladish/raw/commit/30994438a1363306f00078a5791202cc4a73151f/waf -> ${P}-waf-2.0.22"
 	KEYWORDS="~amd64"
 fi
 LICENSE="GPL-2"
@@ -36,6 +35,7 @@ RDEPEND="media-libs/alsa-lib
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
+	dev-util/intltool
 	virtual/pkgconfig"
 
 DOCS=( AUTHORS README NEWS )

diff --git a/media-sound/ladish/ladish-9999.ebuild b/media-sound/ladish/ladish-9999.ebuild
@@ -28,6 +28,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="media-libs/alsa-lib
 	media-sound/jack2[dbus]
 	sys-apps/dbus
+	dev-libs/cdbus
 	dev-libs/expat
 	lash? ( !media-sound/lash )
 	${PYTHON_DEPS}"
@@ -39,16 +40,11 @@ BDEPEND="
 	doc? ( app-doc/doxygen )
 "
 
-DOCS=( AUTHORS README NEWS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-disable-gladish.patch"
-)
-
 QA_SONAME=( ".*/libalsapid.so" )
 
 src_prepare()
 {
+	rm -rf ".git" || die "Failed to remove git dir"
 	sed -i -e "s/RELEASE = False/RELEASE = True/" wscript
 	append-cxxflags '-std=c++11'
 	default
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		DIST cdbus-1.0_pre20230703.gh.tar.gz 169623 BLAKE2B 2fc57a83dea700d125220c0a6fd4fc4e76261f0fb3afb765233cd39bb303d31ae1e17204d47d910a8766dc223b288e44c456236ad7ee86836224107095b75391 SHA512 495b9a75d3b9615ec0b40308c707c527345b42034e7182b90cf59a4e0d72418480e667666706a3248ca5f9519606317af200e97ac2ec70d2925e829b907da9dc