From 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 2 Jun 2018 10:47:13 +0100
Subject: gentoo resync : 02.06.2018

---
 x11-plugins/pidgin-mbpurple/Manifest               |  2 +-
 .../pidgin-mbpurple-0.3.0-r2.ebuild                | 23 ++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'x11-plugins/pidgin-mbpurple')

diff --git a/x11-plugins/pidgin-mbpurple/Manifest b/x11-plugins/pidgin-mbpurple/Manifest
index 2e9cf8ef49f8..05a737c65b19 100644
--- a/x11-plugins/pidgin-mbpurple/Manifest
+++ b/x11-plugins/pidgin-mbpurple/Manifest
@@ -1,3 +1,3 @@
 DIST mbpurple-0.3.0.tar.gz 83685 BLAKE2B d1d39b659c0ecd0c81e749d81b8681d83202845232d906c665eec5bf18bc708acda087b117a16eecb510efa13f411ed4816ab4a686b6d38795d8d0cc2f78391b SHA512 9152ce783efd9d1841ec172ccc0f50f2fe0a5d64e9363fdc14150d40d0ec3ef642ed59662f4255dead1d32ce3ae2a47098c993c15c9d2c40b297ddc5f8fe110e
-EBUILD pidgin-mbpurple-0.3.0-r2.ebuild 917 BLAKE2B e99f058c820bf561b7db50f49075ebc41377f5d252d9a1a7a36caa37869d61ff05f83b908eeb796df98c781bdb84729693fa6b265500ee332ac45d92a6657d1c SHA512 63a6e522b24868fce92c9477f8b981fddfeef816bbde7200efb0ae8a7fb334a83a301aa5a676e14c0de6bf8f86fe5e27e6057a5ff503639ac66b5cee985ce01a
+EBUILD pidgin-mbpurple-0.3.0-r2.ebuild 968 BLAKE2B cdd5ad260003f217b76f4786dea4cdff1b77d6ab91cdeb94e80484f1e7cd5ea2a71d4f63c93f4944b1c7ce674a48d2926ff8102694f50ce1bf0e4ba4f28eacc9 SHA512 d40d61ad589209e25ee3e8c06456f1e06bf7773b0d6968f8da640a4dd6444cbb436b85df3e66ea3067c589c48b00459b4cd577e46a2ebed709ca27492a857036
 MISC metadata.xml 351 BLAKE2B 5378e33f3ef95c741a280f68f11763a618711a19ae32aef8dd68da6f1ca2ee6b075e21f5549953063e150644917dcad6023734870e5f94850eb966d80d0fb8e3 SHA512 fc43c5cbe0cadeb67e3ab8dad70c20eb02ad1f183f75c63d59db17985e0be07ab907a1389dae631b20813200ac8456b5e238c0dd57944e6f4fbbffdef5faedd1
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 7a7eeeed84eb..4d1b4a1b27c1 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,19 +22,21 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	tc-export CC
-}
-
 src_prepare() {
+	default
+
 	# 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
 		sed -i 's/twitgin//g' Makefile || die
 	fi
 }
+
+src_configure() {
+	tc-export CC
+}
-- 
cgit v1.2.3