[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-mbpurple/

[Aaron Bauman]

commit:     d6a404124be5939ff1cf99150d22ce3104005b54
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 23:43:04 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu May 31 12:57:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a40412

x11-plugins/pidgin-mbpurple: bump EAPI and drop base eclass

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild 
b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
index 7a7eeeed84e..9e38de55cc1 100644
--- a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
+++ b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit base toolchain-funcs
+inherit toolchain-funcs
+
+MY_P="${P/pidgin-/}"
 
 DESCRIPTION="Pidgin plug-in supporting microblog services like Twitter or 
identi.ca"
 HOMEPAGE="https://code.google.com/p/microblog-purple/";
-MY_P="${P/pidgin-/}"
 SRC_URI="https://microblog-purple.googlecode.com/files/${MY_P}.tar.gz";
 
 LICENSE="GPL-3"
@@ -21,16 +22,16 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig"
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
+src_prepare() {
+       default
+
        tc-export CC
-}
 
-src_prepare() {
        # upstream Issue 226 (Respect LDFLAGS)
-       sed -i "/^LDFLAGS/d" global.mak || die
+       sed -i "/^LDFLAGS/d" global.mak || die "sed for LDFLAGS failed"
 
        # upstream Issue 225 (Warnings during compilation using make -j2)
-       sed -i "s/make /\$(MAKE) /g" Makefile || die
+       sed -i "s/make /\$(MAKE) /g" Makefile || die "sed #2 failed"
 
        # upstream Issue 224 (configurable twitgin)
        if ! use twitgin; then