1 |
commit: 2b55ec62959c37c95448daef2770381eb8a02812 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 10 20:06:02 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 10 20:32:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2b55ec62 |
7 |
|
8 |
dev-python/pyatspi: 2.24.0 → 2.26.0 |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
Manifest-Sign-Key: 0x5A56C8CD0C13248A |
12 |
|
13 |
.../{pyatspi-9999.ebuild => pyatspi-2.26.0.ebuild} | 35 ++++++++-------------- |
14 |
dev-python/pyatspi/pyatspi-9999.ebuild | 22 +++++++------- |
15 |
2 files changed, 23 insertions(+), 34 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild b/dev-python/pyatspi/pyatspi-2.26.0.ebuild |
18 |
similarity index 63% |
19 |
copy from dev-python/pyatspi/pyatspi-9999.ebuild |
20 |
copy to dev-python/pyatspi/pyatspi-2.26.0.ebuild |
21 |
index d1fda773..07a9163d 100644 |
22 |
--- a/dev-python/pyatspi/pyatspi-9999.ebuild |
23 |
+++ b/dev-python/pyatspi/pyatspi-2.26.0.ebuild |
24 |
@@ -1,52 +1,43 @@ |
25 |
-# Copyright 1999-2015 Gentoo Foundation |
26 |
+# Copyright 1999-2018 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Id$ |
29 |
|
30 |
-EAPI="5" |
31 |
-GCONF_DEBUG="no" |
32 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
33 |
+EAPI=6 |
34 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
35 |
|
36 |
-inherit eutils gnome2 python-r1 |
37 |
-if [[ ${PV} = 9999 ]]; then |
38 |
- GNOME_LIVE_MODULE="pyatspi2" |
39 |
- inherit gnome2-live |
40 |
-fi |
41 |
+inherit gnome2 python-r1 |
42 |
|
43 |
DESCRIPTION="Python binding to at-spi library" |
44 |
-HOMEPAGE="http://live.gnome.org/Accessibility" |
45 |
+HOMEPAGE="https://wiki.gnome.org/Accessibility" |
46 |
|
47 |
# Note: only some of the tests are GPL-licensed, everything else is LGPL |
48 |
LICENSE="LGPL-2 GPL-2+" |
49 |
SLOT="0" |
50 |
-if [[ ${PV} = 9999 ]]; then |
51 |
- KEYWORDS="" |
52 |
-else |
53 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
54 |
-fi |
55 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
56 |
+ |
57 |
IUSE="" # test |
58 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
59 |
|
60 |
-COMMON_DEPEND=" |
61 |
+COMMON_DEPEND="${PYTHON_DEPS} |
62 |
>=dev-libs/atk-2.11.2 |
63 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
64 |
>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}] |
65 |
- ${PYTHON_DEPS} |
66 |
" |
67 |
RDEPEND="${COMMON_DEPEND} |
68 |
>=sys-apps/dbus-1 |
69 |
- >=app-accessibility/at-spi2-core-${PV}[introspection] |
70 |
+ >=app-accessibility/at-spi2-core-2.20.2[introspection] |
71 |
!<gnome-extra/at-spi-1.32.0-r1 |
72 |
" |
73 |
DEPEND="${COMMON_DEPEND} |
74 |
virtual/pkgconfig |
75 |
" |
76 |
|
77 |
-src_prepare() { |
78 |
+PATCHES=( |
79 |
# https://bugzilla.gnome.org/show_bug.cgi?id=689957 |
80 |
- epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch" |
81 |
+ "${FILESDIR}/${PN}-2.6.0-examples-python3.patch" |
82 |
+) |
83 |
|
84 |
+src_prepare() { |
85 |
gnome2_src_prepare |
86 |
- |
87 |
python_copy_sources |
88 |
} |
89 |
|
90 |
|
91 |
diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild b/dev-python/pyatspi/pyatspi-9999.ebuild |
92 |
index d1fda773..50395370 100644 |
93 |
--- a/dev-python/pyatspi/pyatspi-9999.ebuild |
94 |
+++ b/dev-python/pyatspi/pyatspi-9999.ebuild |
95 |
@@ -1,19 +1,17 @@ |
96 |
-# Copyright 1999-2015 Gentoo Foundation |
97 |
+# Copyright 1999-2018 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
-# $Id$ |
100 |
|
101 |
-EAPI="5" |
102 |
-GCONF_DEBUG="no" |
103 |
-PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
104 |
+EAPI=6 |
105 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
106 |
|
107 |
-inherit eutils gnome2 python-r1 |
108 |
+inherit gnome2 python-r1 |
109 |
if [[ ${PV} = 9999 ]]; then |
110 |
GNOME_LIVE_MODULE="pyatspi2" |
111 |
inherit gnome2-live |
112 |
fi |
113 |
|
114 |
DESCRIPTION="Python binding to at-spi library" |
115 |
-HOMEPAGE="http://live.gnome.org/Accessibility" |
116 |
+HOMEPAGE="https://wiki.gnome.org/Accessibility" |
117 |
|
118 |
# Note: only some of the tests are GPL-licensed, everything else is LGPL |
119 |
LICENSE="LGPL-2 GPL-2+" |
120 |
@@ -26,11 +24,10 @@ fi |
121 |
IUSE="" # test |
122 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
123 |
|
124 |
-COMMON_DEPEND=" |
125 |
+COMMON_DEPEND="${PYTHON_DEPS} |
126 |
>=dev-libs/atk-2.11.2 |
127 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
128 |
>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}] |
129 |
- ${PYTHON_DEPS} |
130 |
" |
131 |
RDEPEND="${COMMON_DEPEND} |
132 |
>=sys-apps/dbus-1 |
133 |
@@ -41,12 +38,13 @@ DEPEND="${COMMON_DEPEND} |
134 |
virtual/pkgconfig |
135 |
" |
136 |
|
137 |
-src_prepare() { |
138 |
+PATCHES=( |
139 |
# https://bugzilla.gnome.org/show_bug.cgi?id=689957 |
140 |
- epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch" |
141 |
+ "${FILESDIR}/${PN}-2.6.0-examples-python3.patch" |
142 |
+) |
143 |
|
144 |
+src_prepare() { |
145 |
gnome2_src_prepare |
146 |
- |
147 |
python_copy_sources |
148 |
} |