Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-mbpurple/
Date: Thu, 31 May 2018 12:57:20
Message-Id: 1527771424.d6a404124be5939ff1cf99150d22ce3104005b54.bman@gentoo
1 commit: d6a404124be5939ff1cf99150d22ce3104005b54
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 30 23:43:04 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Thu May 31 12:57:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a40412
7
8 x11-plugins/pidgin-mbpurple: bump EAPI and drop base eclass
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 .../pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild | 19 ++++++++++---------
13 1 file changed, 10 insertions(+), 9 deletions(-)
14
15 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
16 index 7a7eeeed84e..9e38de55cc1 100644
17 --- a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
18 +++ b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
19 @@ -1,13 +1,14 @@
20 -# Copyright 1999-2017 Gentoo Foundation
21 +# Copyright 1999-2018 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI=2
25 +EAPI=6
26
27 -inherit base toolchain-funcs
28 +inherit toolchain-funcs
29 +
30 +MY_P="${P/pidgin-/}"
31
32 DESCRIPTION="Pidgin plug-in supporting microblog services like Twitter or identi.ca"
33 HOMEPAGE="https://code.google.com/p/microblog-purple/"
34 -MY_P="${P/pidgin-/}"
35 SRC_URI="https://microblog-purple.googlecode.com/files/${MY_P}.tar.gz"
36
37 LICENSE="GPL-3"
38 @@ -21,16 +22,16 @@ DEPEND="${RDEPEND}
39 virtual/pkgconfig"
40 S=${WORKDIR}/${MY_P}
41
42 -pkg_setup() {
43 +src_prepare() {
44 + default
45 +
46 tc-export CC
47 -}
48
49 -src_prepare() {
50 # upstream Issue 226 (Respect LDFLAGS)
51 - sed -i "/^LDFLAGS/d" global.mak || die
52 + sed -i "/^LDFLAGS/d" global.mak || die "sed for LDFLAGS failed"
53
54 # upstream Issue 225 (Warnings during compilation using make -j2)
55 - sed -i "s/make /\$(MAKE) /g" Makefile || die
56 + sed -i "s/make /\$(MAKE) /g" Makefile || die "sed #2 failed"
57
58 # upstream Issue 224 (configurable twitgin)
59 if ! use twitgin; then