media-sound/mp3splt-gtk: Fix building under -fno-common

Closes: https://bugs.gentoo.org/707126
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 25 insertions, 12 deletions

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[@]}"
 }