Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/
Date: Mon, 27 Feb 2017 21:32:51
Message-Id: 1488231162.42f17a30c10f3bb5a3a84c51b770aa7262919d85.polynomial-c@gentoo
1 commit: 42f17a30c10f3bb5a3a84c51b770aa7262919d85
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 27 21:32:21 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 21:32:42 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f17a30
7
8 net-im/pidgin: Reinstate gnome2 eclass to get rid of an xdg issue.
9
10 This fixes https://bugs.gentoo.org/611138
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 net-im/pidgin/pidgin-2.11.0-r1.ebuild | 7 ++-----
15 1 file changed, 2 insertions(+), 5 deletions(-)
16
17 diff --git a/net-im/pidgin/pidgin-2.11.0-r1.ebuild b/net-im/pidgin/pidgin-2.11.0-r1.ebuild
18 index b1f3b7cf71..21da169356 100644
19 --- a/net-im/pidgin/pidgin-2.11.0-r1.ebuild
20 +++ b/net-im/pidgin/pidgin-2.11.0-r1.ebuild
21 @@ -7,7 +7,7 @@ EAPI=6
22 GENTOO_DEPEND_ON_PERL=no
23 PYTHON_COMPAT=( python2_7 )
24
25 -inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-module python-single-r1
26 +inherit autotools flag-o-matic eutils gnome2 toolchain-funcs multilib perl-module python-single-r1
27
28 DESCRIPTION="GTK Instant Messenger client"
29 HOMEPAGE="http://pidgin.im/"
30 @@ -226,10 +226,7 @@ src_configure() {
31 }
32
33 src_install() {
34 - # mimicking gnome2_src_install as that one is banned for >=EAPI-6 (*sigh*)
35 - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
36 - emake DESTDIR="${D}" install
37 - unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
38 + gnome2_src_install
39
40 if use gtk; then
41 # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other