gentoo resync : 17.08.2021

4 files changed, 41 insertions, 12 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 13f9c33cb725..fb172b419ffa 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/gspeakers/Manifest b/sci-electronics/gspeakers/Manifest
index 452d3343e81b..f77acf61ea1d 100644
--- a/sci-electronics/gspeakers/Manifest
+++ b/sci-electronics/gspeakers/Manifest
@@ -1,7 +1,8 @@
 AUX gspeakers-0.11-c++11.patch 17072 BLAKE2B 9107b0b7dbc7a7862cda0cc45976f54a4eef038134b3d6f66bf9b52826cb96f2c5a13c8ec121a064b6a6c0434ad557e2d5da1a4789f950bedf5dbfd1e6d92960 SHA512 c2d96308d1efd138c6402f2f5edbc225a9ec1dd1378aa65137e88f37b441b112fab554ea4489ec379402362612b2768fa70da38d9256c51e9e17fff99d613fc1
+AUX gspeakers-0.11-cxxflags.patch 723 BLAKE2B ea5042473be685ce9476e10fffe768adb9c6dfc268ec082afdb95a20b9b1149c09479309a08817f44aaec858c732c9097640847d9f5c63d7ea58e116d7c5dc2e SHA512 9e8cd590a4dafa6d1e7ce382c2b134c959d5ea10a3fdbeb7e5d886520ecc027cd357e2c0a717deca8c53a407e025bb80aa089469d4694c40237c268aca7056d5
 AUX gspeakers-0.11-fix-sigc-includes.patch 730 BLAKE2B 057cc12d32466fd19ece24684248bdf998f6cef9eb39b9f85b14d74ae0246a7ce9a50a491f96438834bcf7431ba1c9ae281ac15c5ac5db956503bf9c4360f04c SHA512 048f1b187eda84ccc7280887913340a344a210022aebef7da5ab9f50a8056403d178cec09353298d89b70ef69c30fd3cd376f4be6deda4d221e19793e979d1cc
 AUX gspeakers-0.11-gcc43.patch 1224 BLAKE2B 20b1fbd3841ec236d834344aa26f4ed3b353d3d6a2e54acb611942eb0df6b6015fd45701e09e8ce7ae1a5835efe503c4f26e71498d19f4a50d67e5c94bb62f86 SHA512 13ac2ccd0bac188a7b9ac6cabe937ce8bc5ae5b48052f4db15902a7a2a21fd826353709955c8c8c3cc0aba952ab7c5a34b99c9b4080115160707bfc97b29ba78
 AUX gspeakers-0.11-glib-single-include.patch 3393 BLAKE2B e9320041cd5546b4f056784c3ef6725576ca9b20fb6b748ee1d992602e3ebefdc8c53656866021f9bf8d17b3a690e8be4f63acd7a99f614d5d37a114196a3e12 SHA512 dfa91f565088c3e6a3af0abf454184dff48cc0598e22a0c9b5828373e573755b3c0c7a25dc2b909539f543e5392cc402f5b3677a1ce126e783b3bf32353ac100
 DIST gspeakers-0.11.tar.gz 546406 BLAKE2B fb3b06ef12337c48013dc5497d84ee18ce480729fbf611bd1388005ebe1a1405d72a06e125e20bee94419ca07f5ecf1d559f2470977934cab3a70d98de566ce6 SHA512 5a0c6374b5f18d089a1903c5718ba21b9932e4c6a99456e13d4f144eef243a623aca241590e941fa50300a642876b6be8684bcf036db724182c2ee925072bd20
-EBUILD gspeakers-0.11-r2.ebuild 952 BLAKE2B 70c805312b468c9927ea88a7029755e9b83fffac7ab460b3e2d9cb5652a9d1e6aa4c6d9da2bd785a7faed80c2e6a1972482084e62c1ea8dd2c6207e438c7442c SHA512 771bbe5226dc9d1fa628c900826b582c5b10e970232ca56a86b3e00a84d8066b9b64a6f624efe299e88970aeed6710aff41cae13aa69627a04bb56fe06d68616
+EBUILD gspeakers-0.11-r2.ebuild 923 BLAKE2B 6eacc58f89bafeaf64d23dedf27d157dbbd7b1493312d8fad02b0915ae56c40a8313101ee5f750d513c11ee3d196393c2f6583cad45c59782a47e8d101fc8a7f SHA512 c69b6cab07751575c56fffaccfcea4e3f99f0baff4e1dc9230bfee156857e61bbf28ee971c256a0bafc2cfbfc1d02596df48d18a28c142b2169fc26d1b1a6097
 MISC metadata.xml 358 BLAKE2B d041c1117c152cd7f65a9ccdd0474be82fa842e5e927537e7657d46a71a58d8bd5a45a1aadbddd6fd98f40af1a0b778ddcec51f45ba4d7653b9492e41eea2868 SHA512 b37e0e211329b455aa8bb9599c26d782eaa9a57d8238c161093e1fd4dc5982567f4af51178832a6a75cabe55bd9d86f16ac5a15a0116c100b7f7c32ac5037a59
diff --git a/sci-electronics/gspeakers/files/gspeakers-0.11-cxxflags.patch b/sci-electronics/gspeakers/files/gspeakers-0.11-cxxflags.patch
new file mode 100644
index 000000000000..a890921ab45f
--- /dev/null
+++ b/sci-electronics/gspeakers/files/gspeakers-0.11-cxxflags.patch
@@ -0,0 +1,24 @@
+From 849257811990d18789e6ce995423fcb5327f986e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 14 Aug 2021 22:03:56 +0200
+Subject: [PATCH] Fix CXXFLAGS
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cece557..7cb0f11 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -40,5 +40,5 @@ cellrendererpopup.h cellrendererpopup.cc \
+ crossoverimageview.h crossoverimageview.cc \
+ gspeakersfilechooser.h gspeakersfilechooser.cc
+ 
+-CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall -O0
++CXXFLAGS = @CXXFLAGS@ $(DEPS_CFLAGS) -Wall
+ LDADD = $(DEPS_LIBS)
+-- 
+2.32.0
+
diff --git a/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild b/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild
index 38be7a2bcdba..28ce47c011f6 100644
--- a/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild
+++ b/sci-electronics/gspeakers/gspeakers-0.11-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
+EAPI=7
 
-inherit autotools epatch flag-o-matic gnome2
+inherit autotools flag-o-matic gnome2
 
 DESCRIPTION="GTK based loudspeaker enclosure and crossovernetwork designer"
 HOMEPAGE="http://gspeakers.sourceforge.net/"
@@ -22,20 +21,25 @@ RDEPEND="
 	|| (
 		sci-electronics/gnucap
 		sci-electronics/ngspice
-		sci-electronics/spice )
+		sci-electronics/spice
+	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cxxflags.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-glib-single-include.patch
+	"${FILESDIR}"/${P}-fix-sigc-includes.patch
+	"${FILESDIR}"/${P}-c++11.patch
+)
+
 src_prepare() {
-	sed -i -e "s/-O0//" src/Makefile.am
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-glib-single-include.patch
-	epatch "${FILESDIR}"/${P}-fix-sigc-includes.patch
-	epatch "${FILESDIR}"/${P}-c++11.patch
 	append-cxxflags '-std=c++11'
 	mv configure.in configure.ac || die
-	eautoreconf
 	gnome2_src_prepare
+	eautoreconf
 }