[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-musictracker/, x11-plugins/pidgin-musictracker/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-musictracker/, x11-plugins/pidgin-musictracker/files/

[Ben Kohler]

commit:     8372206ee884128f2891bdb37ce06b03c452ac47
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Feb  1 10:22:02 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 16:59:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8372206e

x11-plugins/pidgin-musictracker: Port to EAPI 7

* Fix build with gcc-10

Closes: https://bugs.gentoo.org/717424
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../files/pidgin-musictracker-0.4.22-fno-common.patch   | 12 ++++++++++++
 .../pidgin-musictracker-0.4.22.ebuild                   | 17 ++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.22-fno-common.patch b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.22-fno-common.patch
new file mode 100644
index 00000000000..0378523c346
--- /dev/null
+++ b/x11-plugins/pidgin-musictracker/files/pidgin-musictracker-0.4.22-fno-common.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/717424
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -21,7 +21,7 @@ pcre* regex(const char* pattern, int options);
+ int capture(pcre* re, const char *text, int len, ...);
+ 
+ #ifndef WIN32
+-DBusGConnection *connection;
++extern DBusGConnection *connection;
+ gboolean dbus_g_init_connection(void);
+ gboolean dbus_g_running(const char *name);
+ #endif

diff --git a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
index e576da2c7f0..4b562484649 100644
--- a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
+++ b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,15 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=net-im/pidgin-2.0.0[gtk]
-	>=dev-libs/dbus-glib-0.73
+DEPEND="
+	dev-libs/dbus-glib
 	dev-libs/libpcre
-	>=sys-devel/gettext-0.17"
+	net-im/pidgin[gtk]"
 RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default
-	sed -i -e "s/DOMAIN/PACKAGE/g" po/Makefile.in.in || die "sed failed"
+	sed -i -e "s/DOMAIN/PACKAGE/g" po/Makefile.in.in || die
 	eautoreconf
 }
 
@@ -34,5 +37,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -delete || die "error cleaning la file."
+	find "${ED}" -name '*.la' -delete || die
 }