From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B5E7E138359 for ; Wed, 8 Jul 2020 06:58:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCB18E0828; Wed, 8 Jul 2020 06:58:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9DCEEE0828 for ; Wed, 8 Jul 2020 06:58:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B9AB34EE85 for ; Wed, 8 Jul 2020 06:58:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A96C12A4 for ; Wed, 8 Jul 2020 06:58:32 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1594191425.14502b4e6318b37c80b4792ac000d5cc1e66c509.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/cadence/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/cadence/cadence-9999.ebuild X-VCS-Directories: media-sound/cadence/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 14502b4e6318b37c80b4792ac000d5cc1e66c509 X-VCS-Branch: master Date: Wed, 8 Jul 2020 06:58:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f353ad1b-8c4b-4129-8c35-f5eb928355a5 X-Archives-Hash: 187a90796724dc5cf24a62275576557c commit: 14502b4e6318b37c80b4792ac000d5cc1e66c509 Author: Gerion Entrup flump de> AuthorDate: Fri Jun 19 00:05:17 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jul 8 06:57:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14502b4e media-sound/cadence: Update live ebuild - Python 3.8 support - Prefix support (untested) - Shebang fix Signed-off-by: Gerion Entrup flump.de> Signed-off-by: Miroslav Šulc gentoo.org> media-sound/cadence/cadence-9999.ebuild | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild index 1059f334e10..3618cd021dd 100644 --- a/media-sound/cadence/cadence-9999.ebuild +++ b/media-sound/cadence/cadence-9999.ebuild @@ -3,11 +3,11 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit git-r3 python-single-r1 xdg desktop DESCRIPTION="Collection of tools useful for audio production" -HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence" +HOMEPAGE="https://kxstudio.linuxaudio.org/Applications:Cadence" EGIT_REPO_URI="https://github.com/falkTX/Cadence.git" KEYWORDS="" LICENSE="GPL-2" @@ -17,7 +17,6 @@ IUSE="a2jmidid -pulseaudio opengl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet CDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' @@ -49,7 +48,7 @@ src_prepare() { } src_compile() { - myemakeargs=(PREFIX="/usr" + myemakeargs=(PREFIX="${EPREFIX}/usr" SKIP_STRIPPING=true ) @@ -57,17 +56,22 @@ src_compile() { } src_install() { - emake PREFIX="/usr" DESTDIR="${D}" install + emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install + + python_fix_shebang ${ED} # Clean up stuff that shouldn't be installed - rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject - rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop - rm -rf "${D}"/usr/share/applications/*.desktop + 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 "${D}"/usr/bin/cadence-pulse2{jack,loopback} - rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback} + 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"