From 8fd9d385e5bc3c01115ec2ddcb2227607eb90861 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2024 14:04:26 +0000 Subject: gentoo auto-resync : 05:01:2024 - 14:04:25 --- media-sound/guitarix/Manifest | 6 +++--- .../guitarix/files/guitarix-0.41.0-py3.11.patch | 20 -------------------- .../guitarix/files/guitarix-0.44.1-py3.11.patch | 20 ++++++++++++++++++++ media-sound/guitarix/guitarix-0.44.1.ebuild | 7 ++++--- media-sound/guitarix/guitarix-9999.ebuild | 3 ++- 5 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch create mode 100644 media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch (limited to 'media-sound/guitarix') diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest index ebcbacc0e73d..136d9cd30775 100644 --- a/media-sound/guitarix/Manifest +++ b/media-sound/guitarix/Manifest @@ -1,8 +1,8 @@ AUX guitarix-0.41.0-nostrip.patch 1355 BLAKE2B 2c21349bc6cb3a93c4e4ac8275917f62c3e874e6a0b2ee726d4531fd2265c1f4d6d8553f9e35f42a277a4f4854c6d9ce38bb1a8070154d3de6bdf6a3e7f73684 SHA512 16ea3c1a14277abf7a5af306d96fb547c7b49f5d552dd67b7997d2fec515884e7e30c1f3150a25ad28bca0726cf8f135c65d7503012ca1d6e841302566ea6c90 -AUX guitarix-0.41.0-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf5204288ecd83c235ef1af66b60e36cdb475547c12c239c601778ce660e5e055db27563a115d1500c17e337ef25a65400 SHA512 db975cb4186c83125f2116afb50304fe8eccca85e647b61a43ef8703f8c6b0407004745dcbbbc08f3b6ddfa45c3edc46163a41a1acd5cedf8548053cbf7cde08 AUX guitarix-0.44.1-gcc-13.patch 762 BLAKE2B 33679e1a80ed0f094d71d7525574368a816ec723c5b81974ae600360045a7d748e88a6a08e7f6b15f0b2d7441b6fc431f1ca0cd2bc71fb1abbf51798be949789 SHA512 02c49c0a87f788b781a54c7ff2d0429130dcd93a86fa7fe27f8e55ea444eb31b768b9716de1be28bd59f3f2e4055ec11da5d9d310bdba2ba3b266b013725cff0 +AUX guitarix-0.44.1-py3.11.patch 625 BLAKE2B cc4e06902b893a67b9a3297d15cd71cf5204288ecd83c235ef1af66b60e36cdb475547c12c239c601778ce660e5e055db27563a115d1500c17e337ef25a65400 SHA512 db975cb4186c83125f2116afb50304fe8eccca85e647b61a43ef8703f8c6b0407004745dcbbbc08f3b6ddfa45c3edc46163a41a1acd5cedf8548053cbf7cde08 AUX guitarix-0.44.1-zita-resampler-1.10.patch 824 BLAKE2B 89a0c980a9f7fa03e4e3de9e34cc6cd4cd07f91bb1702a57e443dfcebf6262213e7da8147c36dec93536f59201d4cf77a8c7f48ae0ca0b5a9bfa023cd9b66d1f SHA512 f889f9a97bd41b9a03a0b9fda4ddabfb7ba36aa847636a1361273ec59d9ad2829ba652f841d2c7dd387545df630ec6b697d0428e7e7da14d2c4d03f7ad292a70 DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1 -EBUILD guitarix-0.44.1.ebuild 1987 BLAKE2B 9d56946501916190788e76393b9476f3a6e29ead006aa74f5170fe79dc96017bfdddff93cac6254fc393f231eba5c4b8179bf820e5457434aa5cf9ee64a45d75 SHA512 6a5eb65d945c6ecb1114891d74555fc6bfeec73f5da5bcfa14381ff457a3bf6f795befdd23394c6dc8994f15de6cc5a68144cee98ccb914bad8551acef786c7b -EBUILD guitarix-9999.ebuild 1920 BLAKE2B 1c4fedba09c20ee9ac4f3754bf6c7158ad5dd5dd8d028823d8ee53b398bf560c1bd5ec7c67c2922c3912ab3da848349f516d6599c27a2496d131e6f56723669b SHA512 8e90a60e2dad35663d4fec682b067a818c1766ee22a36d295f4352df26d916cda83df0b5d1c686eab5ba4aea6bbf9d5972d321e9128ce3113fce12f3c950a7f4 +EBUILD guitarix-0.44.1.ebuild 2013 BLAKE2B 226cd350313cd0eaa8424d6d2179d9d0eed45c373ca26896352b96cbbf15291b786bf13c1aa9c30d09f3bd9235dcc29aef02ca992385b8133c5e563205f24684 SHA512 42f33bcfd12ad0c3b5eb57e37bbb3b24830431ee22da043c4c414f89a50a73e42034dc0b08012226970fbd4366663472e3167e77e6956d6d29cf1d4f1e3698ed +EBUILD guitarix-9999.ebuild 1962 BLAKE2B a1038f45d3aca7835809e87e6baec4102cfac00266e18578df41f6ea9c7588841e7c4009077aee853b0eeb741a6c79e688e0e86bf489e56a93a488e344ee497a SHA512 fae06a32d25c3ae9c29781feabd978f7641fde304d67f4dfdc2e5d8d3108f8c2db794f98760200031510cc64ce2ea50f170ae17318f09c59b3179ea307f8b79c MISC metadata.xml 775 BLAKE2B 9d259fec3163a9b8150ed287c8ed803314620ba60c60dd479051ae980d5c25a007b38b2d6712720af834b90ff91c72962d55bb539983001f98bb4ed549511c35 SHA512 6ad0963c139caaffa1b58a60fa30a797b69a7ed74a8924606e60c75b2ae6751954c179ab0ff40a83288c0ad7655c9ed499e38c7bf0a88928e2dcddf5ab6a5826 diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch deleted file mode 100644 index f419c2ed7ce7..000000000000 --- a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 39d7c21c4173eb0f121b1bbff439d9cf43331a00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= -Date: Wed, 11 Jan 2023 18:55:36 -0500 -Subject: [PATCH] waf: python 3.11 removed the 'U' open mode - -Python3 deprecated it already by making this the default behaviour. ---- a/wscript -+++ b/wscript -@@ -537,7 +537,7 @@ def sub_file(task): - dst_fname = task.outputs[0].abspath() - lst = task.generator.sub_list - -- with open(src_fname, 'rU') as f: -+ with open(src_fname, 'r') as f: - txt = f.read() - for (key, val) in lst: - re_pat = re.compile(key, re.M) --- -2.39.2 - diff --git a/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch new file mode 100644 index 000000000000..f419c2ed7ce7 --- /dev/null +++ b/media-sound/guitarix/files/guitarix-0.44.1-py3.11.patch @@ -0,0 +1,20 @@ +From 39d7c21c4173eb0f121b1bbff439d9cf43331a00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Wed, 11 Jan 2023 18:55:36 -0500 +Subject: [PATCH] waf: python 3.11 removed the 'U' open mode + +Python3 deprecated it already by making this the default behaviour. +--- a/wscript ++++ b/wscript +@@ -537,7 +537,7 @@ def sub_file(task): + dst_fname = task.outputs[0].abspath() + lst = task.generator.sub_list + +- with open(src_fname, 'rU') as f: ++ with open(src_fname, 'r') as f: + txt = f.read() + for (key, val) in lst: + re_pat = re.compile(key, re.M) +-- +2.39.2 + diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild index 60b76beb379f..7296f64747af 100644 --- a/media-sound/guitarix/guitarix-0.44.1.ebuild +++ b/media-sound/guitarix/guitarix-0.44.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE='threads(+)' -inherit python-any-r1 waf-utils xdg +inherit multiprocessing python-any-r1 waf-utils xdg DESCRIPTION="Virtual guitar amplifier for Linux" HOMEPAGE="https://guitarix.org/" @@ -63,8 +63,8 @@ DOCS=( changelog README ) PATCHES=( "${FILESDIR}"/${PN}-0.41.0-nostrip.patch - "${FILESDIR}"/${PN}-0.41.0-py3.11.patch - "${FILESDIR}"/${PN}-0.44.1-zita-resampler-1.10.patch + "${FILESDIR}"/${P}-py3.11.patch + "${FILESDIR}"/${P}-zita-resampler-1.10.patch "${FILESDIR}"/${P}-gcc-13.patch ) @@ -82,6 +82,7 @@ src_configure() { --no-faust --no-ldconfig --shared-lib + --jobs=$(makeopts_jobs) $(use_enable nls) $(usex bluetooth "" "--no-bluez") $(usex debug "--debug" "") diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild index ed2429d53f6d..490d308775b1 100644 --- a/media-sound/guitarix/guitarix-9999.ebuild +++ b/media-sound/guitarix/guitarix-9999.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)' EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git" EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master" -inherit python-any-r1 waf-utils xdg git-r3 +inherit multiprocessing python-any-r1 waf-utils xdg git-r3 DESCRIPTION="Virtual guitar amplifier for Linux" HOMEPAGE="https://guitarix.org/" @@ -79,6 +79,7 @@ src_configure() { --no-faust --no-ldconfig --shared-lib + --jobs=$(makeopts_jobs) $(use_enable nls) $(usex bluetooth "" "--no-bluez") $(usex debug "--debug" "") -- cgit v1.2.3