gentoo resync : 25.11.2020

3 files changed, 42 insertions, 24 deletions

diff --git a/media-sound/spek/Manifest b/media-sound/spek/Manifest
index 0a91d897ecf3..c8b4b3530cb2 100644
--- a/media-sound/spek/Manifest
+++ b/media-sound/spek/Manifest
@@ -1,8 +1,9 @@
 AUX spek-0.8.1-disable-updates.patch 273 BLAKE2B c13fa0288b4464289967484a0c3a482b2a9f19e170a52329445cf3875831e552b85aa363ca6fb07033dc29de0edbce38d4045d8b2ff01b693f26e103cce1208e SHA512 90ca3adcf4fb677953ae4d7e50dc1bed62ba21e92f52dd9ec724b146244084bcde15da3317dab0feac9da522d0b3e49e5bad17c16209a3f0cc9b1b8780141040
+AUX spek-0.8.3-AR.patch 416 BLAKE2B 4a4d83b1eda983d19b42008be2a3531be1b845df07381e3e543d64be3a4c0f30b3ff37cf49c8a9ed15561bdb224b150c5605f896ccc4e25f98d40b92cebc9cad SHA512 dd0375e46bb3130cc7d31e548abdb2799c63037532030f935a79cc1a4349485de4a368e81dbee0f1527174bd2c2c42380cf0682715306287f96d453ef955f5e0
 AUX spek-0.8.3-ffmpeg3-1.patch 1314 BLAKE2B b8bc16079d2c6e7a108a6b4c92991ff674e0b073aef65da05bafc4ae3f88eeef1ae1728b563b7efbd1b64b95157a7e7519dfceb8007acc31de67a2eb87c76e34 SHA512 86f3668bff3ae9475d5db10c69ebbf277c0d03b18da3a1e8abc5531c80ebd22c4124e2fa700d9dfa4afda42d3141fc5fb569e4f7f2d9be2c6986577a3285eaaa
 AUX spek-0.8.3-ffmpeg3.patch 1253 BLAKE2B 8111886d4e8fe3a6c7e942c617dbaecc16cf11691885458fc96dfb9988ef615392eb641454d26bcc40414fdbc0f590dab2f805f1f0e0549023edd7e6b5787a9c SHA512 3e56b1965e0bd07f11089c8e09af1d12f03ca34244f74703a006e5bb420cbcb9ae5f4af4e984b0735198f68b74143486bcc27f07c14dce4780b05b57fb87ed86
 AUX spek-0.8.3-replace-gnu+11-with-c++11.patch 248 BLAKE2B 90872d7bec32e44f4a792fc9c76ee38eb8c9406b1063dd217a8dc97794589a382eed1b34639e849382011f921ccb3b83032700277dd7a4bcb7b09659f14a46f4 SHA512 5bb0ac9970656a03d0c7ab7ddbde59660a0b443ffda59bf3a0e9897d8705f0b49211b8fec52f218c25aa7764d646eb47c489eb7b992bc6f32c7f82382e8d17b3
 AUX spek-0.8.3-stdlib.patch 472 BLAKE2B 3007ae0f366b366b67c3168e9e33cb18a72632e68886f8fcab428cde126c82fb84d7fc7d9b81fd0d8f77f81da49bcfdefd140d31afde4063a0b169d837d658e6 SHA512 d42906e7fbb0707fb8eefc3e3cc19a18c28f4af9b56995cdfa486fd3fab92c11cc313bc3b76fd115e99ada892e3191ff80f33020b0c4cc56fb26a0540b526ea4
 DIST spek-0.8.3.tar.gz 1349573 BLAKE2B ce783c319741c43f27462caf9dcd27e71f4c8fbc9d3a3d2ac0b977189cca4cf8ed14f258958bbf59532c4cae97562fa20819222ae68567e9e607f243a2777000 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c
-EBUILD spek-0.8.3-r1.ebuild 1086 BLAKE2B 208de5a0476cc3ddeb9a97738700553826347907d709b68209be24e589c713249f5ccc8ea02d0754b9b869680dd46b780545fa2c36ec4f812c1c46209c4f69a3 SHA512 ab10d7964daaae4dda7e3d5e5f84ab81eae3312d0c646301857adc0a521b99b3cb6a34036546c081e20d2d771f66104452e856981ae42c49fff4dc7d6467335a
+EBUILD spek-0.8.3-r1.ebuild 893 BLAKE2B 81c94f5b4ae9f969d716ed1500199523cef3a36a6fc021161cb8c2369137d1d76c48b6aa14703f5fb4e40e17e0a5f152e3fc4b36b4d234445c6105a43e9de819 SHA512 e81fa761631491f921a4841a3df30aa54ff95d3c0d79da8788d99e0ca11b40070e355dff101577d1ee46c72632cf04cc165fc37daafd4277e4250d0fbe4b688a
 MISC metadata.xml 293 BLAKE2B fab72d60cfe06b97698b72a5c6949612f92696a41a1a32077e2d0e544a51c82d8429c0d823f6dc2fbb0ae17dc04a0a8471c2ffc202f1eaf5fbac18004ce1a509 SHA512 737aac30952de1d589f19e6e9643b7ccfff0773b07322efda37e6d18c5dfd4e6845bc938ab2faa605633610a62340f561eb67a5b011562caf153b8bd9f3b603f
diff --git a/media-sound/spek/files/spek-0.8.3-AR.patch b/media-sound/spek/files/spek-0.8.3-AR.patch
new file mode 100644
index 000000000000..be797ba663fc
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-AR.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/754861
+https://github.com/alexkay/spek/pull/198
+
+diff --git a/configure.ac b/configure.ac
+index 3fc451b..b270033 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE([1.11.1 foreign no-dist-gzip dist-xz serial-tests])
+ AM_SILENT_RULES([yes])
+ 
+ AC_LANG([C++])
++AM_PROG_AR
+ AC_PROG_CXX
+ CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
+ AC_PROG_CXXCPP
+-- 
+2.26.2
+
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
index 4c60f5cbe8a1..be7cff895114 100644
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 WX_GTK_VER="3.0"
 
-inherit autotools eutils toolchain-funcs wxwidgets
+inherit autotools wxwidgets xdg
 
 DESCRIPTION="Analyse your audio files by showing their spectrogram"
 HOMEPAGE="http://www.spek-project.org/"
@@ -16,30 +17,28 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	media-video/ffmpeg:0=
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig
-	>=sys-devel/gcc-4.7
 	sys-devel/gettext
-"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch
+	"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-ffmpeg3.patch
+	"${FILESDIR}"/${P}-ffmpeg3-1.patch
+	"${FILESDIR}"/${P}-AR.patch
+)
 
 src_prepare() {
-	need-wxwidgets unicode
-
-	if [ $(gcc-major-version) -lt "4" ] ; then
-		die "You need to activate at least gcc:4.7"
-	fi
-	if [ $(gcc-major-version) -eq "4" -a $(gcc-minor-version) -lt "7" ] ; then
-		die "You need to activate at least gcc:4.7"
-	fi
-
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch \
-		"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch \
-		"${FILESDIR}"/${P}-stdlib.patch \
-		"${FILESDIR}"/${P}-ffmpeg3.patch \
-		"${FILESDIR}"/${P}-ffmpeg3-1.patch
+	default
 	eautoreconf
 }
+
+src_configure() {
+	setup-wxwidgets unicode
+	default
+}