gentoo resync : 25.08.2020

3 files changed, 27 insertions, 13 deletions

diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index ca7ebfd70770..e33e4469aff1 100644
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -1,3 +1,4 @@
+AUX mp3splt-gtk-0.9.2-fno-common.patch 274 BLAKE2B 2a2368bab0d06b3c347bdce2a7c19a4b1707f405716dfa7c603b65ad085a001ecd29727c4ff8ca5c4c21c2371cab5b377a106a60f396850128d753f76d6a43d1 SHA512 b9f96afc59238a2824f3d79503acccb09ed45b2ad7527df665c0274a59a2779855274c91e2ce4e4b3cc5d4dce749a634049380acc37f827e4f4b1cf34d539f8d
 DIST mp3splt-gtk-0.9.2.tar.gz 1070580 BLAKE2B b49a246eeb03d11ec8d4c8968323c62e200439af5d2cb52321442365615b20444908f4c33e6bddeec4051fc320f303b98a1d341bc834ec768bc4d803d2fb5be8 SHA512 e837cbc0759cd6535fc466099a170d066ab72b4854f8546f524261fe660887f5d2add60d9fa1e19d68d811004c682a324b5bcba86aa8cb89ae1ad2bc2f9b1d9d
-EBUILD mp3splt-gtk-0.9.2-r1.ebuild 931 BLAKE2B bdc420f10381a12566c1d57d3f2008432823ac753865b35558b787773a3044add747b8cdfc0356368368d2a3f2d8377a81979bfcf6a5b95954c455182ecf9159 SHA512 5865f27686cb54a4eb2b3e435af561213d733b23d55fb224d17ed8cd680eecbf59c2e01dc54645e3e80c500c1e69474b23d85584b9a5ec8c88acfe2280aaaf1a
+EBUILD mp3splt-gtk-0.9.2-r1.ebuild 995 BLAKE2B 390cd2ef5aa692abd5ba8bcd961a4c653498133ea0e6d4b09a11a47d33b2f3d2c0ee5205aee339ef489e7cf3fcf2e92bd0ad1ac1b46c35e2b282c3bda129c860 SHA512 6a657d68a32d0614b6478802fbb6f10c4d5a61827f9e416659187f433c70b495d818cda99047dc9c66fe4d3f4816276fd3f5634ce781e10aa196aa6cbc369503
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch
new file mode 100644
index 000000000000..646d59008c6e
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.9.2-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/splitpoints_window.h
++++ b/src/splitpoints_window.h
+@@ -41,7 +41,7 @@
+ #include "all_includes.h"
+ 
+ //!The enum telling which item is kept in which column of the splitpoint tree
+-enum {
++typedef enum {
+   COL_CHECK = 0,
+   COL_DESCRIPTION = 1,
+   COL_MINUTES = 2,
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
index edd740e08563..9355f8230680 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit versionator autotools
+inherit autotools
 
-DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding"
+DESCRIPTION="A GTK+ based utility to split mp3 and ogg files without decoding"
 HOMEPAGE="http://mp3splt.sourceforge.net"
 SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
 
@@ -20,12 +20,14 @@ RDEPEND="
 	dev-libs/dbus-glib
 	gstreamer? (
 		media-libs/gstreamer:1.0
-		media-plugins/gst-plugins-meta:1.0[mp3] )
-"
-DEPEND="${RDEPEND}
+		media-plugins/gst-plugins-meta:1.0[mp3]
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-fno-common.patch )
 
 src_prepare() {
 	default
@@ -33,15 +35,15 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
 
-	use nls || myconf+=" --disable-nls"
-	use gstreamer || myconf+=" --disable-gstreamer"
+	use nls || myconf+=( --disable-nls )
+	use gstreamer || myconf+=( --disable-gstreamer )
 
 	econf \
 		--disable-audacious \
 		--disable-gnome \
 		$(use_enable doc doxygen_doc) \
 		--disable-cutter \
-		${myconf}
+		"${myconf[@]}"
 }