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 1ED8F1389E2 for ; Fri, 28 Nov 2014 19:03:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9791FE086D; Fri, 28 Nov 2014 19:03:19 +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 328C8E086D for ; Fri, 28 Nov 2014 19:03:19 +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 30130340526 for ; Fri, 28 Nov 2014 19:03:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D177AB1AB for ; Fri, 28 Nov 2014 19:03:16 +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: <1417201391.c52e9c2f103ff1845b42f5372c22a4725672b200.mgorny@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-editors/gedit/ X-VCS-Repository: proj/gnome X-VCS-Files: app-editors/gedit/gedit-9999.ebuild X-VCS-Directories: app-editors/gedit/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c52e9c2f103ff1845b42f5372c22a4725672b200 X-VCS-Branch: master Date: Fri, 28 Nov 2014 19:03:16 +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: 2d9f8f53-ad9a-4fc6-8ad9-9a8544a093bb X-Archives-Hash: dd005a541095e82983287f599fd1b984 commit: c52e9c2f103ff1845b42f5372c22a4725672b200 Author: Michał Górny gentoo org> AuthorDate: Fri Nov 28 19:03:11 2014 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Nov 28 19:03:11 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c52e9c2f app-editors/gedit: sync the live ebuild Package-Manager: portage-2.2.14 Manifest-Sign-Key: EFB4464E! --- app-editors/gedit/gedit-9999.ebuild | 47 +++++++++++++++---------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild index 9497a22..ca629cf 100644 --- a/app-editors/gedit/gedit-9999.ebuild +++ b/app-editors/gedit/gedit-9999.ebuild @@ -21,7 +21,9 @@ LICENSE="GPL-2+ CC-BY-SA-3.0" SLOT="0" IUSE="+introspection +python spell vala" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas +# we need to fix that +REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" @@ -51,14 +53,14 @@ COMMON_DEPEND=" >=x11-libs/gtk+-3:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] dev-python/pycairo[${PYTHON_USEDEP}] - >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] ) + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[${PYTHON_USEDEP}] ) spell? ( >=app-text/enchant-1.2:= >=app-text/iso-codes-0.35 ) " RDEPEND="${COMMON_DEPEND} x11-themes/gnome-icon-theme-symbolic - python? ( dev-libs/libpeas[${PYTHON_USEDEP}] ) " DEPEND="${COMMON_DEPEND} ${vala_depend} @@ -78,35 +80,27 @@ if [[ ${PV} = 9999 ]]; then app-text/yelp-tools" fi +pkg_setup() { + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup +} + src_prepare() { vala_src_prepare gnome2_src_prepare - - python_copy_sources } src_configure() { - local myconf="" - [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" - local myconf - myconf=" - --disable-deprecations - --enable-updater - --enable-gvfs-metadata - $(use_enable introspection) - $(use_enable spell) - $(use_enable vala) - $(use_enable python) + gnome2_src_configure \ + --disable-deprecations \ + --enable-updater \ + --enable-gvfs-metadata \ + $(use_enable introspection) \ + $(use_enable spell) \ + $(use_enable vala) \ + $(use_enable python) \ ITSTOOL=$(type -P true) - " - - if use python ; then - python_parallel_foreach_impl gnome2_src_configure ${myconf} - else - gnome2_src_configure ${myconf} - fi } src_test() { @@ -118,9 +112,6 @@ src_test() { } src_install() { - if use python ; then - python_foreach_impl gnome2_src_install - else - gnome2_src_install - fi + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations + gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides" }