From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 916C2139694 for ; Mon, 27 Feb 2017 21:32:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C10B21C012; Mon, 27 Feb 2017 21:32:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EB3A21C012 for ; Mon, 27 Feb 2017 21:32:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C48934112A for ; Mon, 27 Feb 2017 21:32:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FAAE56CB for ; Mon, 27 Feb 2017 21:32:46 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1488231162.42f17a30c10f3bb5a3a84c51b770aa7262919d85.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/pidgin/pidgin-2.11.0-r1.ebuild X-VCS-Directories: net-im/pidgin/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 42f17a30c10f3bb5a3a84c51b770aa7262919d85 X-VCS-Branch: master Date: Mon, 27 Feb 2017 21:32:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7a5eb1cf-7cbe-446a-948b-a545c1f96ba0 X-Archives-Hash: b82ee00b440e8e19d0e7e7b91b5ab2db commit: 42f17a30c10f3bb5a3a84c51b770aa7262919d85 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 27 21:32:21 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 27 21:32:42 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f17a30 net-im/pidgin: Reinstate gnome2 eclass to get rid of an xdg issue. This fixes https://bugs.gentoo.org/611138 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-im/pidgin/pidgin-2.11.0-r1.ebuild | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net-im/pidgin/pidgin-2.11.0-r1.ebuild b/net-im/pidgin/pidgin-2.11.0-r1.ebuild index b1f3b7cf71..21da169356 100644 --- a/net-im/pidgin/pidgin-2.11.0-r1.ebuild +++ b/net-im/pidgin/pidgin-2.11.0-r1.ebuild @@ -7,7 +7,7 @@ EAPI=6 GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-module python-single-r1 +inherit autotools flag-o-matic eutils gnome2 toolchain-funcs multilib perl-module python-single-r1 DESCRIPTION="GTK Instant Messenger client" HOMEPAGE="http://pidgin.im/" @@ -226,10 +226,7 @@ src_configure() { } src_install() { - # mimicking gnome2_src_install as that one is banned for >=EAPI-6 (*sigh*) - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" - emake DESTDIR="${D}" install - unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + gnome2_src_install if use gtk; then # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other