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 43A1313933E for ; Thu, 1 Jul 2021 05:02:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EE44E0821; Thu, 1 Jul 2021 05:02:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 78B29E0821 for ; Thu, 1 Jul 2021 05:02:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6A91B33C84E for ; Thu, 1 Jul 2021 05:02:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75E8E4C3 for ; Thu, 1 Jul 2021 05:02:50 +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: <1625115635.5f5c7b85b427f0a26cf6fed2d29fe8a7e8da33d0.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/a2jmidid/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/a2jmidid/a2jmidid-9.ebuild media-sound/a2jmidid/a2jmidid-9999.ebuild X-VCS-Directories: media-sound/a2jmidid/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 5f5c7b85b427f0a26cf6fed2d29fe8a7e8da33d0 X-VCS-Branch: master Date: Thu, 1 Jul 2021 05:02:50 +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: 440a8414-c97d-4cc0-819d-cde1bbdbc6c1 X-Archives-Hash: 6ef59d0f7cb971d6e8ca488a93b3c382 commit: 5f5c7b85b427f0a26cf6fed2d29fe8a7e8da33d0 Author: Nikita Zlobin gmail com> AuthorDate: Wed Jun 30 19:02:19 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jul 1 05:00:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5c7b85 media-sound/a2jmidid: python support is back Bug: https://bugs.gentoo.org/798411 Signed-off-by: Nikita Zlobin gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21418 Signed-off-by: Miroslav Šulc gentoo.org> media-sound/a2jmidid/a2jmidid-9.ebuild | 21 ++++++++++++++++++--- media-sound/a2jmidid/a2jmidid-9999.ebuild | 21 ++++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/media-sound/a2jmidid/a2jmidid-9.ebuild b/media-sound/a2jmidid/a2jmidid-9.ebuild index 62228ef8c0d..1d5c181d312 100644 --- a/media-sound/a2jmidid/a2jmidid-9.ebuild +++ b/media-sound/a2jmidid/a2jmidid-9.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson +PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_REQ_USE="threads(+)" + +inherit meson python-single-r1 DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system" HOMEPAGE="https://github.com/linuxaudio/a2jmidid" @@ -12,7 +15,8 @@ SRC_URI="https://github.com/linuxaudio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm x86" -IUSE="dbus" +IUSE="dbus python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" virtual/pkgconfig @@ -21,6 +25,7 @@ CDEPEND=" media-libs/alsa-lib virtual/jack dbus? ( sys-apps/dbus ) + python? ( ${PYTHON_DEPS} ) " RDEPEND="${CDEPEND}" DEPEND="${RDEPEND}" @@ -34,3 +39,13 @@ src_configure() { meson_src_configure } + +src_install() { + meson_src_install + + if use python; then + python_fix_shebang "${ED}" + else + rm "${ED}/usr/bin/a2j_control" || die + fi +} diff --git a/media-sound/a2jmidid/a2jmidid-9999.ebuild b/media-sound/a2jmidid/a2jmidid-9999.ebuild index 7609deb0eba..eeb15605c52 100644 --- a/media-sound/a2jmidid/a2jmidid-9999.ebuild +++ b/media-sound/a2jmidid/a2jmidid-9999.ebuild @@ -1,9 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson git-r3 +PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_REQ_USE="threads(+)" + +inherit meson python-single-r1 git-r3 DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system" HOMEPAGE="https://github.com/linuxaudio/a2jmidid" @@ -12,7 +15,8 @@ EGIT_REPO_URI="https://github.com/linuxaudio/a2jmidid.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="dbus" +IUSE="dbus python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" BDEPEND=" virtual/pkgconfig @@ -21,6 +25,7 @@ CDEPEND=" media-libs/alsa-lib virtual/jack dbus? ( sys-apps/dbus ) + python? ( ${PYTHON_DEPS} ) " RDEPEND="${CDEPEND}" DEPEND="${RDEPEND}" @@ -34,3 +39,13 @@ src_configure() { meson_src_configure } + +src_install() { + meson_src_install + + if use python; then + python_fix_shebang "${ED}" + else + rm "${ED}/usr/bin/a2j_control" || die + fi +}