commit: 2b55ec62959c37c95448daef2770381eb8a02812
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 20:06:02 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 20:32:16 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2b55ec62
dev-python/pyatspi: 2.24.0 → 2.26.0
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Manifest-Sign-Key: 0x5A56C8CD0C13248A
.../{pyatspi-9999.ebuild => pyatspi-2.26.0.ebuild} | 35 ++++++++--------------
dev-python/pyatspi/pyatspi-9999.ebuild | 22 +++++++-------
2 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild
b/dev-python/pyatspi/pyatspi-2.26.0.ebuild
similarity index 63%
copy from dev-python/pyatspi/pyatspi-9999.ebuild
copy to dev-python/pyatspi/pyatspi-2.26.0.ebuild
index d1fda773..07a9163d 100644
--- a/dev-python/pyatspi/pyatspi-9999.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.26.0.ebuild
@@ -1,52 +1,43 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils gnome2 python-r1
-if [[ ${PV} = 9999 ]]; then
- GNOME_LIVE_MODULE="pyatspi2"
- inherit gnome2-live
-fi
+inherit gnome2 python-r1
DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="http://live.gnome.org/Accessibility"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
# Note: only some of the tests are GPL-licensed, everything else is LGPL
LICENSE="LGPL-2 GPL-2+"
SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
IUSE="" # test
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPEND="
+COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/atk-2.11.2
dev-python/dbus-python[${PYTHON_USEDEP}]
>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
"
RDEPEND="${COMMON_DEPEND}
>=sys-apps/dbus-1
- >=app-accessibility/at-spi2-core-${PV}[introspection]
+ >=app-accessibility/at-spi2-core-2.20.2[introspection]
!<gnome-extra/at-spi-1.32.0-r1
"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
-src_prepare() {
+PATCHES=(
# https://bugzilla.gnome.org/show_bug.cgi?id=689957
- epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+ "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+)
+src_prepare() {
gnome2_src_prepare
-
python_copy_sources
}
diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild
b/dev-python/pyatspi/pyatspi-9999.ebuild
index d1fda773..50395370 100644
--- a/dev-python/pyatspi/pyatspi-9999.ebuild
+++ b/dev-python/pyatspi/pyatspi-9999.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils gnome2 python-r1
+inherit gnome2 python-r1
if [[ ${PV} = 9999 ]]; then
GNOME_LIVE_MODULE="pyatspi2"
inherit gnome2-live
fi
DESCRIPTION="Python binding to at-spi library"
-HOMEPAGE="http://live.gnome.org/Accessibility"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
# Note: only some of the tests are GPL-licensed, everything else is LGPL
LICENSE="LGPL-2 GPL-2+"
@@ -26,11 +24,10 @@ fi
IUSE="" # test
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPEND="
+COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/atk-2.11.2
dev-python/dbus-python[${PYTHON_USEDEP}]
>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
"
RDEPEND="${COMMON_DEPEND}
>=sys-apps/dbus-1
@@ -41,12 +38,13 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
-src_prepare() {
+PATCHES=(
# https://bugzilla.gnome.org/show_bug.cgi?id=689957
- epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+ "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+)
+src_prepare() {
gnome2_src_prepare
-
python_copy_sources
}