gentoo auto-resync : 21:12:2024 - 06:30:51

5 files changed, 41 insertions, 27 deletions

diff --git a/media-sound/alsa-scarlett-gui/Manifest b/media-sound/alsa-scarlett-gui/Manifest
index f430b3885902..0184d588788d 100644
--- a/media-sound/alsa-scarlett-gui/Manifest
+++ b/media-sound/alsa-scarlett-gui/Manifest
@@ -1,4 +1,4 @@
-AUX alsa-scarlett-gui-0.4.0-no-Werror.patch 332 BLAKE2B 571f7774182bbce3cfdbcb6a00848628845990252fba243f876d4e2bc0879cf4374fed30c6338003a4403f231e1dec599a090a5a0b29db3f0162fed3223ab187 SHA512 ab27e16a46caf509d6b428262962d4df5122ebfd092f13069e66c128b98433780452fb4babd0116f1bfadb2900f451c8a1f069b4d93a9bf8979ee28cbc3c686a
+AUX alsa-scarlett-gui-0.4.0_adjust-cflags.patch 584 BLAKE2B b4f58ccdd9586162c036b5290abb0cd31069aac225a929be885fb2b7a8b90861ce4c3b7e5e683259a224fd26123ef0e0a44150413bf602c9e339ead7abc24391 SHA512 ad4b922a3745f1e44d4d0c56f7ba464789843d7b5ddfe9674f88c9d77875e1597ff076238bb277dee43d79c3bb9f0b608c80f3bd8edb538eccd7edba5f99d397
 DIST alsa-scarlett-gui-0.4.0.tar.gz 3434771 BLAKE2B 5bdab633a8271e99eec06aac8b9629ad50eb9a4cf892fe962f30848fc7644036093056d0db75f60accd13757dbeb578c0cfa365aa6dcd2655985564e1039a7d9 SHA512 9cc316f153cd197823295dc57012931f75b3cb06f9ea87661853626e3d9326ce1a433adfb8af23bcdc1e76f9ab59d2175bee9e3d02da0b4a7b3365caf734e1e2
-EBUILD alsa-scarlett-gui-0.4.0.ebuild 616 BLAKE2B 87071f9f2f0244e7d246e0655bfe97d6c47c098aa0209e03d5c3116c7b2fff744b68a03ebcd585aa30c6496c4e7ff1b96346d9b5ba0fd15a6f9aae49ff62cd36 SHA512 f0dbe8a9611ad9beb57b8d873a08b92c8a6f36a2a636fbd5ba7d9ebe53d6cc2cab290a7c517d357561bcc257dbf5b32219f65bea6a9fe0e26d11ea99823ace10
-MISC metadata.xml 453 BLAKE2B 6de6fb3e0f17b2e5e760efb9a429afae2b96b2825d597a8d13232c93bcbe1f2cecf16804c66931be07fac9af3944a7293299cbdef6325cc20407b3e16a23032c SHA512 f7f52d3834a241b92a46ec49d1560dc273ece1fc86abe1dfcb492f04efa53e5af7f156d229f17f76dcccbc8566df32889b30a650d31979234b2fed52a170b92f
+EBUILD alsa-scarlett-gui-0.4.0-r1.ebuild 679 BLAKE2B fc79e70dd99b3f1824ce0308db69ce50305fa9609fd99f2ac83dcb6333862352c3941d0f0d8d1716e3977fea9db80da6a68f66667d9cb10f5ac76ece20042e0d SHA512 cd265c7a73335d0e08b01cdc916cc098be1059d86dd24631a94436239146b44249307a24fe02aaf2e73a7b5848e38e48312ec056c5ae35054dcf9a75b859563b
+MISC metadata.xml 550 BLAKE2B f5159ddf4ece4111c0b962992d0b92435d80686b9f23a49b101ab7ba96d220daaf4341b6e2e16693ee52869597e220f4e3468d32aa9fcb8a4297655e856b6461 SHA512 67f60290188bb16b1cf4902f3c24e23be6549d80d4ad3f04fc580d10cedcee93af93cc16967aa0d69b396391bacd2dbaa80455216019a3772c11e9ce3cbca82f
diff --git a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0-r1.ebuild
index 0961a09d3b1e..12bccb36b04c 100644
--- a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0.ebuild
+++ b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit xdg
+inherit toolchain-funcs xdg
 
 DESCRIPTION="A UI for Focusrite Scarlett and Clarett audio interfaces"
 HOMEPAGE="https://github.com/geoffreybennett/alsa-scarlett-gui"
@@ -22,9 +22,13 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.0-no-Werror.patch"
+	"${FILESDIR}"/${PN}-0.4.0_adjust-cflags.patch
 )
 
 MAKEOPTS="${MAKEOPTS} -C src"
 
 export PREFIX="/usr"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch
deleted file mode 100644
index e6c98f5c4889..000000000000
--- a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0-no-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -13,7 +13,7 @@ DEPDIR := .deps
- DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
- 
- CFLAGS ?= -ggdb -fno-omit-frame-pointer -O2
--CFLAGS += -Wall -Werror -D_FORTIFY_SOURCE=2
-+CFLAGS += -Wall -D_FORTIFY_SOURCE=2
- CFLAGS += -DVERSION=\"$(VERSION)\"
- CFLAGS += -Wno-error=deprecated-declarations
- 
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0_adjust-cflags.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0_adjust-cflags.patch
new file mode 100644
index 000000000000..4b3619f82e9a
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.4.0_adjust-cflags.patch
@@ -0,0 +1,20 @@
+From: Filip Kobierski <fkobi@pm.me>
+
+This also deletes -Werror as that was done anyway and it's simpler to apply one patch
+
+Bug: https://bugs.gentoo.org/936815
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,6 +13,6 @@ DEPDIR := .deps
+ DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
+ 
+ CFLAGS ?= -ggdb -fno-omit-frame-pointer -O2
+-CFLAGS += -Wall -Werror -D_FORTIFY_SOURCE=2
++CFLAGS += -Wall
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -Wno-error=deprecated-declarations
diff --git a/media-sound/alsa-scarlett-gui/metadata.xml b/media-sound/alsa-scarlett-gui/metadata.xml
index 14a5040e976b..db54e9ffc947 100644
--- a/media-sound/alsa-scarlett-gui/metadata.xml
+++ b/media-sound/alsa-scarlett-gui/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-<name>Jason A. Donenfeld</name>
-</maintainer>
-<maintainer type="project">
-<email>proaudio@gentoo.org</email>
-<name>Gentoo ProAudio Project</name>
-</maintainer>
-<upstream>
-<remote-id type="github">geoffreybennett/alsa-scarlett-gui</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/geoffreybennett/alsa-scarlett-gui/issues</bugs-to>
+		<remote-id type="github">geoffreybennett/alsa-scarlett-gui</remote-id>
+	</upstream>
 </pkgmetadata>