commit: f6d977c80de58261c57e631f14785155208078b3 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Mar 9 18:06:02 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Mar 9 20:12:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d977c8
media-sound/jack2: drop 1.9.21-r1 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-sound/jack2/Manifest | 1 - .../jack2/files/jack2-1.9.21-python3.11.patch | 19 ---- media-sound/jack2/jack2-1.9.21-r1.ebuild | 113 --------------------- 3 files changed, 133 deletions(-) diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest index 4be5b0f4194a..5ffeac4b5e99 100644 --- a/media-sound/jack2/Manifest +++ b/media-sound/jack2/Manifest @@ -1,2 +1 @@ -DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557 DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4 diff --git a/media-sound/jack2/files/jack2-1.9.21-python3.11.patch b/media-sound/jack2/files/jack2-1.9.21-python3.11.patch deleted file mode 100644 index f4aafcf16aed..000000000000 --- a/media-sound/jack2/files/jack2-1.9.21-python3.11.patch +++ /dev/null @@ -1,19 +0,0 @@ -'U' is default and deprecated since python-3.3, becomes a failure in 3.11. - -Just a quick fix (rather than bump waf) while waiting for upstream's -plans to migrate to meson: -https://github.com/jackaudio/jack2/issues/898 ---- a/waflib/ConfigSet.py -+++ b/waflib/ConfigSet.py -@@ -314,3 +314,3 @@ - tbl = self.table -- code = Utils.readf(filename, m='rU') -+ code = Utils.readf(filename, m='r') - for m in re_imp.finditer(code): ---- a/waflib/Context.py -+++ b/waflib/Context.py -@@ -664,3 +664,3 @@ - try: -- code = Utils.readf(path, m='rU', encoding=encoding) -+ code = Utils.readf(path, m='r', encoding=encoding) - except EnvironmentError: diff --git a/media-sound/jack2/jack2-1.9.21-r1.ebuild b/media-sound/jack2/jack2-1.9.21-r1.ebuild deleted file mode 100644 index fd26048dd608..000000000000 --- a/media-sound/jack2/jack2-1.9.21-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="threads(+)" -inherit flag-o-matic python-single-r1 waf-utils multilib-minimal - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"; -else - SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" -fi - -DESCRIPTION="Jackdmp jack implemention for multi-processor machine" -HOMEPAGE="https://jackaudio.org/"; - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="2" -IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( classic dbus )" - -DEPEND=" - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - dbus? ( - dev-libs/expat[${MULTILIB_USEDEP}] - sys-apps/dbus[${MULTILIB_USEDEP}] - ) - libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) - ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) - metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] ) - systemd? ( classic? ( sys-apps/systemd:= ) )" -RDEPEND=" - ${DEPEND} - dbus? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - ') - ) - pam? ( sys-auth/realtime-base ) - !media-sound/jack-audio-connection-kit - !media-video/pipewire[jack-sdk(-)]" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig - doc? ( app-doc/doxygen )" -# tools were formerly provided here, pull to maintain expectations -PDEPEND="tools? ( media-sound/jack-example-tools )" - -DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.21-python3.11.patch -) - -src_prepare() { - default - - python_fix_shebang waf - multilib_copy_sources -} - -multilib_src_configure() { - # clients crash if built with lto - # https://github.com/jackaudio/jack2/issues/485 - filter-lto - - local wafargs=( - --mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1 - - --alsa=$(usex alsa) - --celt=no - $(usev classic --classic) - --db=$(usex metadata) - $(usev dbus --dbus) - --doxygen=$(multilib_native_usex doc) - --firewire=$(usex ieee1394) - --iio=no - --opus=$(usex opus) - --portaudio=no - --samplerate=$(usex libsamplerate) - --systemd=$(multilib_native_usex systemd $(usex classic)) - --winmme=no - - # obsolete options, migrated to media-sound/jack-example-tools - # and will be removed entirely next version - --example-tools=no - --readline=no - --sndfile=no - --zalsa=no - ) - - waf-utils_src_configure "${wafargs[@]}" -} - -multilib_src_compile() { - waf-utils_src_compile -} - -multilib_src_install() { - waf-utils_src_install -} - -multilib_src_install_all() { - use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control -}
