From 8a9900695984826133efc1815bba609dd739d11f Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 12 Feb 2014 12:39:34 +0000 Subject: Fixed compilation with USE="-ncurses python" (bug #501034) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) --- net-im/pidgin/ChangeLog | 6 +++++- net-im/pidgin/pidgin-2.10.9-r1.ebuild | 4 ++-- net-im/pidgin/pidgin-2.10.9.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'net-im') diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index 737258a7b071..15805479faec 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.328 2014/02/09 08:26:50 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.329 2014/02/12 12:39:34 polynomial-c Exp $ + + 12 Feb 2014; Lars Wendler pidgin-2.10.9.ebuild, + pidgin-2.10.9-r1.ebuild: + Fixed compilation with USE="-ncurses python" (bug #501034). 09 Feb 2014; Agostino Sarubbo pidgin-2.10.9.ebuild: Stable for sparc, wrt bug #499596 diff --git a/net-im/pidgin/pidgin-2.10.9-r1.ebuild b/net-im/pidgin/pidgin-2.10.9-r1.ebuild index 7cb7705ade2e..c4b1213d9023 100644 --- a/net-im/pidgin/pidgin-2.10.9-r1.ebuild +++ b/net-im/pidgin/pidgin-2.10.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9-r1.ebuild,v 1.4 2014/02/09 06:44:35 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9-r1.ebuild,v 1.5 2014/02/12 12:39:34 polynomial-c Exp $ EAPI=5 @@ -122,7 +122,7 @@ pkg_setup() { elog "You did not pick the ncurses or gtk use flags, only libpurple" elog "will be built." fi - if use dbus || { use ncurses && use python; }; then + if use python || use dbus ; then python-single-r1_pkg_setup fi diff --git a/net-im/pidgin/pidgin-2.10.9.ebuild b/net-im/pidgin/pidgin-2.10.9.ebuild index fac3ea7f2178..79e93b934e08 100644 --- a/net-im/pidgin/pidgin-2.10.9.ebuild +++ b/net-im/pidgin/pidgin-2.10.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9.ebuild,v 1.6 2014/02/09 08:26:50 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9.ebuild,v 1.7 2014/02/12 12:39:34 polynomial-c Exp $ EAPI=5 @@ -121,7 +121,7 @@ pkg_setup() { elog "You did not pick the ncurses or gtk use flags, only libpurple" elog "will be built." fi - if use dbus || { use ncurses && use python; }; then + if use python || use dbus ; then python-single-r1_pkg_setup fi -- cgit v1.2.3-65-gdbad