Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/gedit: gedit-3.12.2-r1.ebuild ChangeLog
Date: Mon, 01 Dec 2014 11:32:52
Message-Id: 20141201113248.BB9B6B487@oystercatcher.gentoo.org
1 mgorny 14/12/01 11:32:48
2
3 Modified: gedit-3.12.2-r1.ebuild ChangeLog
4 Log:
5 Backport the Python fixes from gnome overlay.
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.3 app-editors/gedit/gedit-3.12.2-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: gedit-3.12.2-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- gedit-3.12.2-r1.ebuild 24 Nov 2014 10:06:15 -0000 1.2
23 +++ gedit-3.12.2-r1.ebuild 1 Dec 2014 11:32:48 -0000 1.3
24 @@ -1,11 +1,11 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.2 2014/11/24 10:06:15 pacho Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.3 2014/12/01 11:32:48 mgorny Exp $
29
30 EAPI="5"
31 GCONF_DEBUG="no"
32 GNOME2_LA_PUNT="yes" # plugins are dlopened
33 -PYTHON_COMPAT=( python3_{2,3,4} )
34 +PYTHON_COMPAT=( python3_{3,4} )
35
36 inherit eutils gnome2 multilib python-r1 virtualx
37
38 @@ -16,7 +16,9 @@
39 SLOT="0"
40
41 IUSE="+introspection +python spell zeitgeist"
42 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
43 +# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
44 +# we need to fix that
45 +REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
46
47 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
48
49 @@ -42,7 +44,8 @@
50 >=x11-libs/gtk+-3:3[introspection]
51 >=x11-libs/gtksourceview-3.6:3.0[introspection]
52 dev-python/pycairo[${PYTHON_USEDEP}]
53 - >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
54 + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
55 + dev-libs/libpeas[${PYTHON_USEDEP}] )
56 spell? (
57 >=app-text/enchant-1.2:=
58 >=app-text/iso-codes-0.35 )
59 @@ -50,7 +53,6 @@
60 "
61 RDEPEND="${COMMON_DEPEND}
62 x11-themes/gnome-icon-theme-symbolic
63 - python? ( dev-libs/libpeas[${PYTHON_USEDEP}] )
64 "
65 DEPEND="${COMMON_DEPEND}
66 app-text/docbook-xml-dtd:4.1.2
67 @@ -63,6 +65,10 @@
68 "
69 # yelp-tools, gnome-common needed to eautoreconf
70
71 +pkg_setup() {
72 + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
73 +}
74 +
75 src_prepare() {
76 # FIXME: Not able to set some metadata
77 sed -e '/g_test_add_func/d' \
78 @@ -74,27 +80,15 @@
79 src_configure() {
80 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
81
82 - gedit_configure() {
83 - ECONF_SOURCE=${S} \
84 - gnome2_src_configure \
85 - --disable-deprecations \
86 - --enable-updater \
87 - --enable-gvfs-metadata \
88 - $(use_enable introspection) \
89 - $(use_enable spell) \
90 - $(use_enable zeitgeist) \
91 - ITSTOOL=$(type -P true) \
92 - "$@"
93 - }
94 -
95 - gedit_py_configure() {
96 - mkdir -p "${BUILD_DIR}" || die
97 - run_in_build_dir gedit_configure --enable-python
98 - }
99 -
100 - # run gedit_py_configure first to avoid out-of-source build for C code
101 - use python && python_parallel_foreach_impl gedit_py_configure
102 - gedit_configure --disable-python
103 + gnome2_src_configure \
104 + --disable-deprecations \
105 + --enable-updater \
106 + --enable-gvfs-metadata \
107 + $(use_enable introspection) \
108 + $(use_enable spell) \
109 + $(use_enable python) \
110 + $(use_enable zeitgeist) \
111 + ITSTOOL=$(type -P true)
112 }
113
114 src_test() {
115 @@ -106,13 +100,6 @@
116 }
117
118 src_install() {
119 - gedit_py_install() {
120 - pushd "${BUILD_DIR}" > /dev/null || die
121 - # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
122 - emake DESTDIR="${D}" top_builddir="${S}" pyoverridesdir="$(python_get_sitedir)/gi/overrides" install
123 - popd > /dev/null
124 - }
125 -
126 - gnome2_src_install
127 - use python && python_foreach_impl gedit_py_install
128 + # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
129 + gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides"
130 }
131
132
133
134 1.375 app-editors/gedit/ChangeLog
135
136 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/ChangeLog?rev=1.375&view=markup
137 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/ChangeLog?rev=1.375&content-type=text/plain
138 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/ChangeLog?r1=1.374&r2=1.375
139
140 Index: ChangeLog
141 ===================================================================
142 RCS file: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v
143 retrieving revision 1.374
144 retrieving revision 1.375
145 diff -u -r1.374 -r1.375
146 --- ChangeLog 24 Nov 2014 10:06:15 -0000 1.374
147 +++ ChangeLog 1 Dec 2014 11:32:48 -0000 1.375
148 @@ -1,6 +1,9 @@
149 # ChangeLog for app-editors/gedit
150 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
151 -# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.374 2014/11/24 10:06:15 pacho Exp $
152 +# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.375 2014/12/01 11:32:48 mgorny Exp $
153 +
154 + 01 Dec 2014; Michał Górny <mgorny@g.o> gedit-3.12.2-r1.ebuild:
155 + Backport the Python fixes from gnome overlay.
156
157 24 Nov 2014; Pacho Ramos <pacho@g.o> gedit-3.12.2-r1.ebuild:
158 Support python 3.4
Report Message
Find on MARC Find on Google Groups