Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-accessibility/at-spi2-atk: ChangeLog metadata.xml at-spi2-atk-2.6.2-r1.ebuild at-spi2-atk-2.8.1.ebuild at-spi2-atk-2.6.2.ebuild
Date: Fri, 04 Oct 2013 15:46:46
Message-Id: 20131004154643.3258D2004C@flycatcher.gentoo.org
1 tetromino 13/10/04 15:46:43
2
3 Modified: ChangeLog metadata.xml at-spi2-atk-2.6.2-r1.ebuild
4 at-spi2-atk-2.8.1.ebuild
5 Removed: at-spi2-atk-2.6.2.ebuild
6 Log:
7 gtk2 flag is not needed with >=at-spi-1.32.0-r1:1
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
10
11 Revision Changes Path
12 1.27 app-accessibility/at-spi2-atk/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?rev=1.27&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?rev=1.27&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog?r1=1.26&r2=1.27
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v
21 retrieving revision 1.26
22 retrieving revision 1.27
23 diff -u -r1.26 -r1.27
24 --- ChangeLog 4 Oct 2013 01:03:00 -0000 1.26
25 +++ ChangeLog 4 Oct 2013 15:46:43 -0000 1.27
26 @@ -1,6 +1,11 @@
27 # ChangeLog for app-accessibility/at-spi2-atk
28 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.26 2013/10/04 01:03:00 tetromino Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/ChangeLog,v 1.27 2013/10/04 15:46:43 tetromino Exp $
31 +
32 + 04 Oct 2013; Alexandre Rostovtsev <tetromino@g.o>
33 + -at-spi2-atk-2.6.2.ebuild, at-spi2-atk-2.6.2-r1.ebuild,
34 + at-spi2-atk-2.8.1.ebuild, metadata.xml:
35 + gtk2 flag is not needed with >=at-spi-1.32.0-r1:1
36
37 *at-spi2-atk-2.6.2-r1 (04 Oct 2013)
38
39
40
41
42 1.3 app-accessibility/at-spi2-atk/metadata.xml
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml?rev=1.3&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml?rev=1.3&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml?r1=1.2&r2=1.3
47
48 Index: metadata.xml
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/metadata.xml,v
51 retrieving revision 1.2
52 retrieving revision 1.3
53 diff -u -r1.2 -r1.3
54 --- metadata.xml 4 Oct 2013 01:03:00 -0000 1.2
55 +++ metadata.xml 4 Oct 2013 15:46:43 -0000 1.3
56 @@ -2,8 +2,4 @@
57 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
58 <pkgmetadata>
59 <herd>gnome-accessibility</herd>
60 - <use>
61 - <flag name="gtk2">Install bridge module for <pkg>x11-libs/gtk+:2</pkg>. Disable
62 - this flag if you want to use <pkg>gnome-extra/at-spi</pkg> instead.</flag>
63 - </use>
64 </pkgmetadata>
65
66
67
68 1.2 app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild?rev=1.2&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild?rev=1.2&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild?r1=1.1&r2=1.2
73
74 Index: at-spi2-atk-2.6.2-r1.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild,v
77 retrieving revision 1.1
78 retrieving revision 1.2
79 diff -u -r1.1 -r1.2
80 --- at-spi2-atk-2.6.2-r1.ebuild 4 Oct 2013 01:03:00 -0000 1.1
81 +++ at-spi2-atk-2.6.2-r1.ebuild 4 Oct 2013 15:46:43 -0000 1.2
82 @@ -1,6 +1,6 @@
83 # Copyright 1999-2013 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild,v 1.1 2013/10/04 01:03:00 tetromino Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.6.2-r1.ebuild,v 1.2 2013/10/04 15:46:43 tetromino Exp $
87
88 EAPI="5"
89 GCONF_DEBUG="no"
90 @@ -14,7 +14,7 @@
91 LICENSE="LGPL-2+"
92 SLOT="2"
93 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
94 -IUSE="+gtk2"
95 +IUSE=""
96
97 COMMON_DEPEND="
98 >=app-accessibility/at-spi2-core-2.6
99 @@ -23,18 +23,13 @@
100 >=sys-apps/dbus-1
101 "
102 RDEPEND="${COMMON_DEPEND}
103 - gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
104 + !<gnome-extra/at-spi-1.32.0-r1
105 "
106 DEPEND="${COMMON_DEPEND}
107 virtual/pkgconfig
108 "
109
110 src_prepare() {
111 - if ! use gtk2; then
112 - sed -e '/SUBDIRS/ s/gtk-2.0//' \
113 - -i atk-adaptor/Makefile.{am,in} || die "sed failed"
114 - fi
115 -
116 # disable teamspaces test since that requires Novell.ICEDesktop.Daemon
117 epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
118
119
120
121
122 1.3 app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild
123
124 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild?rev=1.3&view=markup
125 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild?rev=1.3&content-type=text/plain
126 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild?r1=1.2&r2=1.3
127
128 Index: at-spi2-atk-2.8.1.ebuild
129 ===================================================================
130 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v
131 retrieving revision 1.2
132 retrieving revision 1.3
133 diff -u -r1.2 -r1.3
134 --- at-spi2-atk-2.8.1.ebuild 4 Oct 2013 01:03:00 -0000 1.2
135 +++ at-spi2-atk-2.8.1.ebuild 4 Oct 2013 15:46:43 -0000 1.3
136 @@ -1,6 +1,6 @@
137 # Copyright 1999-2013 Gentoo Foundation
138 # Distributed under the terms of the GNU General Public License v2
139 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.2 2013/10/04 01:03:00 tetromino Exp $
140 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.8.1.ebuild,v 1.3 2013/10/04 15:46:43 tetromino Exp $
141
142 EAPI="5"
143 GCONF_DEBUG="no"
144 @@ -14,7 +14,7 @@
145 LICENSE="LGPL-2+"
146 SLOT="2"
147 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
148 -IUSE="+gtk2"
149 +IUSE=""
150
151 COMMON_DEPEND="
152 >=app-accessibility/at-spi2-core-2.7.5
153 @@ -23,21 +23,12 @@
154 >=sys-apps/dbus-1
155 "
156 RDEPEND="${COMMON_DEPEND}
157 - gtk2? ( !<gnome-extra/at-spi-1.32.0-r1 )
158 + !<gnome-extra/at-spi-1.32.0-r1
159 "
160 DEPEND="${COMMON_DEPEND}
161 virtual/pkgconfig
162 "
163
164 -src_prepare() {
165 - if ! use gtk2; then
166 - sed -e '/SUBDIRS/ s/gtk-2.0//' \
167 - -i atk-adaptor/Makefile.{am,in} || die "sed failed"
168 - fi
169 -
170 - gnome2_src_prepare
171 -}
172 -
173 src_configure() {
174 gnome2_src_configure --enable-p2p
175 }