gentoo resync : 29.12.2022

4 files changed, 21 insertions, 69 deletions

diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index eff771b8e9dc..d1b6fb518070 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,4 +1,3 @@
-AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dbac98c1bd0d964fdd5644bf4d431b76758829f2bb183a84644f714813a03d666a4630e3b38bf1a171c7534d3bc5487ca8566ebe7 SHA512 00d4bf65a9ba73fdce5690f23ef80c84c02b532dd607025ddf28f19b5cb8e81c2d661e61b6b1ea31e2783c72ee1650f1befe01df1b52c0413d9f02438bce253b
-DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
-EBUILD patchage-1.0.4.ebuild 951 BLAKE2B a224d38a2bad4119fb798bb823537d82410a8ecbe76a047d26d4d24ee6f10555db9be4359426a58cea963e9a54791aafd3d78c7ff7a3f033932d5f490159c746 SHA512 1770a22ccb29e87f00c9b2f6ffc1b08d76ea5067a27793bf56bc8bf0ad8dc30526295754a426e184a2d53ef5f53a45f2c6d1cb1a1cd4365dc4134f763ab22363
-MISC metadata.xml 355 BLAKE2B 07b7a3c571166e24a93417478bb27d1d94e9e201b2e9137af50cfe04b477e9b99c38edc72fd36abcc4dbc77f65f593f25299deb733df0d9c87625285eb8ef419 SHA512 234ae6322d86d20ce4116991068ef65458f686adfb7b956d5a7c24af672d62a7552ce5023978e65d061e7f9f19b0e9a76e7730f345312a6555fccfc73826df32
+DIST patchage-1.0.6.tar.bz2 664841 BLAKE2B 72d0de6d12e07ec160f4c59c51f138e1220a1b8994bdab90f56dd715bf16b6f561836d184ec5d5077de3bc7bb5c6778ea2b7bcbf0b33230be662f2b729eac568 SHA512 b7aedcb07da0c81842929833ab93a0b20c08e465bf05ebb4e47670d295c0d4d0d50f0f74001d9264c2c23ef08d3881232e7622ecf101d1d53ffcae2f8c0f31d3
+EBUILD patchage-1.0.6.ebuild 918 BLAKE2B 4455184ad29ce50c102d6f13705bfbec72424db030301ed5f4d8d87fb97596ee5dd926b76848bfc2dc36524243f99cd603db43667c9f8318515f4688bc149830 SHA512 8127a176c9a09d8697297cfa46d9fab895b0cdf5f72af3d1c9d18824cb3e062c4bf7ef222483e4a964cdc42656c6303c68b68ca8183ccbe1ce4427402582828c
+MISC metadata.xml 427 BLAKE2B a77d10e847d1ceb32b0ba9ba22a723df471d751c6ecd7ddc849f13fea71c451b9a0c7959687ba09efd23ca7dd6ffd7a77e00abd69021f5ecfeacde0680fa0814 SHA512 3ed9c62eb59dad36bd4477bcdbb95eeff21fcf8ac8c989814d24e288e58b7032452acbce472a191c8151551071b86274fdb935ae6ef5cb916a4b22510ec96789
diff --git a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch b/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
deleted file mode 100644
index aace519e630d..000000000000
--- a/media-sound/patchage/files/patchage-1.0.4-fix-compilation.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/JackDbusDriver.cpp b/src/JackDbusDriver.cpp
-index 23c12f2..f49a522 100644
---- a/src/JackDbusDriver.cpp
-+++ b/src/JackDbusDriver.cpp
-@@ -24,6 +24,7 @@
- #include "SignalDirection.hpp"
- #include "make_jack_driver.hpp"
- #include "warnings.hpp"
-+#include "AudioDriver.hpp"
- 
- PATCHAGE_DISABLE_FMT_WARNINGS
- #include <fmt/core.h>
-@@ -61,7 +62,7 @@ namespace {
- class JackDriver : public AudioDriver
- {
- public:
--  explicit JackDriver(ILog& log, EventSink emit_event);
-+  explicit JackDriver(ILog& log, Driver::EventSink emit_event);
- 
-   JackDriver(const JackDriver&) = delete;
-   JackDriver& operator=(const JackDriver&) = delete;
-@@ -75,7 +76,7 @@ public:
-   void attach(bool launch_daemon) override;
-   void detach() override;
-   bool is_attached() const override;
--  void refresh(const EventSink& sink) override;
-+  void refresh(const Driver::EventSink& sink) override;
-   bool connect(const PortID& tail_id, const PortID& head_id) override;
-   bool disconnect(const PortID& tail_id, const PortID& head_id) override;
- 
-@@ -129,7 +130,7 @@ private:
-   dbus_uint64_t _graph_version;
- };
- 
--JackDriver::JackDriver(ILog& log, EventSink emit_event)
-+JackDriver::JackDriver(ILog& log, Driver::EventSink emit_event)
-   : AudioDriver{std::move(emit_event)}
-   , _log(log)
-   , _dbus_error()
-@@ -584,7 +585,7 @@ JackDriver::is_attached() const
- }
- 
- void
--JackDriver::refresh(const EventSink& sink)
-+JackDriver::refresh(const Driver::EventSink& sink)
- {
-   DBusMessage*    reply_ptr              = nullptr;
-   DBusMessageIter iter                   = {};
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 31c35cf5131f..4bae645001ae 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">drobilla/patchage</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/patchage/patchage-1.0.4.ebuild b/media-sound/patchage/patchage-1.0.6.ebuild
index b9a415d93c20..3427226b5b01 100644
--- a/media-sound/patchage/patchage-1.0.4.ebuild
+++ b/media-sound/patchage/patchage-1.0.6.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 inherit waf-utils python-any-r1 xdg
 
 DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
-HOMEPAGE="http://drobilla.net/software/patchage"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+HOMEPAGE="https://drobilla.net/software/patchage"
+SRC_URI="https://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +18,6 @@ IUSE="alsa debug jack-dbus"
 
 BDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/boost
 	virtual/pkgconfig
 "
 RDEPEND="dev-cpp/glibmm:2
@@ -29,14 +29,12 @@ RDEPEND="dev-cpp/glibmm:2
 		dev-libs/dbus-glib
 		sys-apps/dbus
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/libfmt:="
 
 DOCS=( AUTHORS NEWS README.md )
 
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compilation.patch"
-)
-
 src_configure() {
 	waf-utils_src_configure \
 		$(use debug && echo "--debug") \