1 |
mgorny 14/12/01 11:40:51 |
2 |
|
3 |
Modified: gedit-plugins-3.12.1-r1.ebuild ChangeLog |
4 |
Log: |
5 |
Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to use the correct implementation. |
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-plugins/gedit-plugins-3.12.1-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: gedit-plugins-3.12.1-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- gedit-plugins-3.12.1-r1.ebuild 25 Nov 2014 15:38:33 -0000 1.2 |
23 |
+++ gedit-plugins-3.12.1-r1.ebuild 1 Dec 2014 11:40:51 -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-plugins/gedit-plugins-3.12.1-r1.ebuild,v 1.2 2014/11/25 15:38:33 pacho Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1-r1.ebuild,v 1.3 2014/12/01 11:40:51 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 |
PYTHON_REQ_USE="xml" |
36 |
|
37 |
inherit eutils gnome2 multilib python-r1 |
38 |
@@ -19,11 +19,12 @@ |
39 |
|
40 |
IUSE_plugins="charmap git terminal" |
41 |
IUSE="+python ${IUSE_plugins}" |
42 |
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas |
43 |
REQUIRED_USE=" |
44 |
charmap? ( python ) |
45 |
git? ( python ) |
46 |
+ python? ( ^^ ( $(python_gen_useflags '*') ) ) |
47 |
terminal? ( python ) |
48 |
- python? ( ${REQUIRED_PYTHON_USE} ) |
49 |
" |
50 |
|
51 |
RDEPEND=" |
52 |
@@ -54,6 +55,10 @@ |
53 |
virtual/pkgconfig |
54 |
" |
55 |
|
56 |
+pkg_setup() { |
57 |
+ use python && [[ ${MERGE_TYPE} != binary ]] && python_setup |
58 |
+} |
59 |
+ |
60 |
src_configure() { |
61 |
gnome2_src_configure \ |
62 |
$(use_enable python) \ |
63 |
|
64 |
|
65 |
|
66 |
1.52 app-editors/gedit-plugins/ChangeLog |
67 |
|
68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit-plugins/ChangeLog?rev=1.52&view=markup |
69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit-plugins/ChangeLog?rev=1.52&content-type=text/plain |
70 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit-plugins/ChangeLog?r1=1.51&r2=1.52 |
71 |
|
72 |
Index: ChangeLog |
73 |
=================================================================== |
74 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v |
75 |
retrieving revision 1.51 |
76 |
retrieving revision 1.52 |
77 |
diff -u -r1.51 -r1.52 |
78 |
--- ChangeLog 25 Nov 2014 15:38:33 -0000 1.51 |
79 |
+++ ChangeLog 1 Dec 2014 11:40:51 -0000 1.52 |
80 |
@@ -1,6 +1,10 @@ |
81 |
# ChangeLog for app-editors/gedit-plugins |
82 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
83 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.51 2014/11/25 15:38:33 pacho Exp $ |
84 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/ChangeLog,v 1.52 2014/12/01 11:40:51 mgorny Exp $ |
85 |
+ |
86 |
+ 01 Dec 2014; Michał Górny <mgorny@g.o> gedit-plugins-3.12.1-r1.ebuild: |
87 |
+ Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() to use |
88 |
+ the correct implementation. |
89 |
|
90 |
25 Nov 2014; Pacho Ramos <pacho@g.o> gedit-plugins-3.12.1-r1.ebuild: |
91 |
Support python 3.4 |