diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-01-02 22:20:34 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-01-02 22:20:34 +0000 |
| commit | 03351eb99180d372b419e9f0bb0702916427f25a (patch) | |
| tree | f88ab293774cf2a1adee64e67b70e207dc58295d /app-editors | |
| parent | Stable for amd64 wrt bug #526968 (diff) | |
| download | gentoo-2-03351eb99180d372b419e9f0bb0702916427f25a.tar.gz gentoo-2-03351eb99180d372b419e9f0bb0702916427f25a.tar.bz2 gentoo-2-03351eb99180d372b419e9f0bb0702916427f25a.zip | |
Do not reference Python sitedir when Python is disabled, bug #531968.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/gedit/ChangeLog | 8 | ||||
| -rw-r--r-- | app-editors/gedit/gedit-3.12.2-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-editors/gedit/gedit-3.14.2.ebuild | 9 |
3 files changed, 18 insertions, 8 deletions
diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog index c43d7e34680c..ede777d8a98b 100644 --- a/app-editors/gedit/ChangeLog +++ b/app-editors/gedit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/gedit -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.378 2014/12/19 13:33:36 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.379 2015/01/02 22:20:34 mgorny Exp $ + + 02 Jan 2015; Michał Górny <mgorny@gentoo.org> gedit-3.12.2-r1.ebuild, + gedit-3.14.2.ebuild: + Do not reference Python sitedir when Python is disabled, bug #531968. 19 Dec 2014; Pacho Ramos <pacho@gentoo.org> gedit-3.12.2-r1.ebuild: amd64 stable, bug 529964 diff --git a/app-editors/gedit/gedit-3.12.2-r1.ebuild b/app-editors/gedit/gedit-3.12.2-r1.ebuild index 9637f5a516d8..5679e14f4d87 100644 --- a/app-editors/gedit/gedit-3.12.2-r1.ebuild +++ b/app-editors/gedit/gedit-3.12.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.5 2014/12/19 13:33:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.6 2015/01/02 22:20:34 mgorny Exp $ EAPI="5" GCONF_DEBUG="no" @@ -100,6 +100,9 @@ src_test() { } src_install() { + local args=() # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides" + use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" ) + + gnome2_src_install "${args[@]}" } diff --git a/app-editors/gedit/gedit-3.14.2.ebuild b/app-editors/gedit/gedit-3.14.2.ebuild index a55130282522..9e2ca105be25 100644 --- a/app-editors/gedit/gedit-3.14.2.ebuild +++ b/app-editors/gedit/gedit-3.14.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.2.ebuild,v 1.1 2014/12/15 23:11:33 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.2.ebuild,v 1.2 2015/01/02 22:20:34 mgorny Exp $ EAPI="5" GCONF_DEBUG="no" @@ -99,6 +99,9 @@ src_test() { } src_install() { + local args=() # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations - gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides" + use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" ) + + gnome2_src_install "${args[@]}" } |