From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 822FC1389E2 for ; Mon, 1 Dec 2014 11:48:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BB52E08DC; Mon, 1 Dec 2014 11:48:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C711CE08DC for ; Mon, 1 Dec 2014 11:48:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED28F3404A4 for ; Mon, 1 Dec 2014 11:48:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99717B487 for ; Mon, 1 Dec 2014 11:48:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1417434352.a020a0b83b88165b90f6d887cf140485c9292660.mgorny@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-editors/gedit-plugins/ X-VCS-Repository: proj/gnome X-VCS-Files: app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild X-VCS-Directories: app-editors/gedit-plugins/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a020a0b83b88165b90f6d887cf140485c9292660 X-VCS-Branch: master Date: Mon, 1 Dec 2014 11:48:30 +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: b930a4cd-11e6-49b8-9845-424e0ff2f654 X-Archives-Hash: d639a8a114619fdd7fd4d0626c8e7987 commit: a020a0b83b88165b90f6d887cf140485c9292660 Author: Michał Górny gentoo org> AuthorDate: Mon Dec 1 11:45:52 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Dec 1 11:45:52 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a020a0b8 app-editors/gedit-plugins: fix Python support Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to use the correct implementation. Package-Manager: portage-2.2.14 Manifest-Sign-Key: EFB4464E! --- app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild index 641d4c8..f009722 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild @@ -5,7 +5,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" # plugins are dlopened -PYTHON_COMPAT=( python3_{2,3} ) +PYTHON_COMPAT=( python3_{3,4} ) PYTHON_REQ_USE="xml" inherit eutils gnome2 multilib python-r1 @@ -19,12 +19,13 @@ SLOT="0" IUSE_plugins="charmap git terminal zeitgeist" IUSE="+python ${IUSE_plugins}" +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas REQUIRED_USE=" charmap? ( python ) git? ( python ) + python? ( ^^ ( $(python_gen_useflags '*') ) ) terminal? ( python ) zeitgeist? ( python ) - python? ( ${REQUIRED_PYTHON_USE} ) " RDEPEND=" @@ -56,6 +57,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +pkg_setup() { + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup +} + src_configure() { gnome2_src_configure \ $(use_enable python) \