public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: dev-python/pyatspi/, dev-python/pyatspi/files/
@ 2011-10-03 20:52 Alexandre Restovtsev
  0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-10-03 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     9b522f73464e42c18534e5c1c5f569dc28a955b6
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct  3 20:49:07 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct  3 20:49:07 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9b522f73

dev-python/pyatspi: do not check for pygtk

Upstream bug filed at https://bugzilla.gnome.org/show_bug.cgi?id=660826
Reported on IRC by Arc Riley of pysoy.

---
 .../files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch |   26 ++++++++++++++++++++
 dev-python/pyatspi/pyatspi-2.2.0.ebuild            |    6 ++++-
 dev-python/pyatspi/pyatspi-9999.ebuild             |    6 ++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch b/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch
new file mode 100644
index 0000000..a8f68d3
--- /dev/null
+++ b/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch
@@ -0,0 +1,26 @@
+From 484a3285a5f66ab05ab030fc9217685f02052c91 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Mon, 3 Oct 2011 16:32:23 -0400
+Subject: [PATCH] Drop unneeded pygtk check from AM_CHECK_PYMOD
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660826
+---
+ acinclude.m4 |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 79c3c7c..6622932 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -51,8 +51,6 @@ AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ ifelse([$2],[], [prog="
+ import sys
+ try:
+-	import pygtk
+-	pygtk.require('2.0')
+ 	import $1
+ except ImportError:
+ 	sys.exit(1)
+-- 
+1.7.7
+

diff --git a/dev-python/pyatspi/pyatspi-2.2.0.ebuild b/dev-python/pyatspi/pyatspi-2.2.0.ebuild
index e35891c..d456fc8 100644
--- a/dev-python/pyatspi/pyatspi-2.2.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.2.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2:2.4"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit gnome2 python
+inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	GNOME_LIVE_MODULE="pyatspi2"
 	inherit gnome2-live
@@ -51,6 +51,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# remove pygtk cruft; https://bugzilla.gnome.org/show_bug.cgi?id=660826
+	epatch "${FILESDIR}/${PN}-2.2.0-AM_CHECK_PYMOD-pygtk.patch"
+	[[ ${PV} = 9999 ]] || eautoreconf
+
 	gnome2_src_prepare
 
 	# disable pyc compiling

diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild b/dev-python/pyatspi/pyatspi-9999.ebuild
index e35891c..d456fc8 100644
--- a/dev-python/pyatspi/pyatspi-9999.ebuild
+++ b/dev-python/pyatspi/pyatspi-9999.ebuild
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2:2.4"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit gnome2 python
+inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	GNOME_LIVE_MODULE="pyatspi2"
 	inherit gnome2-live
@@ -51,6 +51,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# remove pygtk cruft; https://bugzilla.gnome.org/show_bug.cgi?id=660826
+	epatch "${FILESDIR}/${PN}-2.2.0-AM_CHECK_PYMOD-pygtk.patch"
+	[[ ${PV} = 9999 ]] || eautoreconf
+
 	gnome2_src_prepare
 
 	# disable pyc compiling



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: dev-python/pyatspi/, dev-python/pyatspi/files/
@ 2012-05-24  9:11 Alexandre Restovtsev
  0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2012-05-24  9:11 UTC (permalink / raw
  To: gentoo-commits

commit:     9c177c41c7709f0dd310d8f19d9eabc59d16c059
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 08:26:19 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 08:26:19 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c177c41

dev-python/pyatspi: update

---
 .../files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch |   26 --------------------
 dev-python/pyatspi/pyatspi-9999.ebuild             |   17 ++++---------
 2 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch b/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch
deleted file mode 100644
index a8f68d3..0000000
--- a/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 484a3285a5f66ab05ab030fc9217685f02052c91 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Mon, 3 Oct 2011 16:32:23 -0400
-Subject: [PATCH] Drop unneeded pygtk check from AM_CHECK_PYMOD
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660826
----
- acinclude.m4 |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 79c3c7c..6622932 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -51,8 +51,6 @@ AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
- ifelse([$2],[], [prog="
- import sys
- try:
--	import pygtk
--	pygtk.require('2.0')
- 	import $1
- except ImportError:
- 	sys.exit(1)
--- 
-1.7.7
-

diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild b/dev-python/pyatspi/pyatspi-9999.ebuild
index 4cf8129..9b6cba0 100644
--- a/dev-python/pyatspi/pyatspi-9999.ebuild
+++ b/dev-python/pyatspi/pyatspi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,9 +6,9 @@ EAPI="4"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.5 3.* *-jython"
 
-inherit autotools eutils gnome2 python
+inherit gnome2 python
 if [[ ${PV} = 9999 ]]; then
 	GNOME_LIVE_MODULE="pyatspi2"
 	inherit gnome2-live
@@ -23,7 +23,7 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
 fi
 IUSE="test"
 
@@ -50,16 +50,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# remove pygtk cruft; https://bugzilla.gnome.org/show_bug.cgi?id=660826
-	epatch "${FILESDIR}/${PN}-2.2.0-AM_CHECK_PYMOD-pygtk.patch"
-	[[ ${PV} = 9999 ]] || eautoreconf
-
 	gnome2_src_prepare
 
-	# disable pyc compiling
-	mv config/py-compile config/py-compile.orig
-	ln -s $(type -P true) config/py-compile
-
+	python_clean_py-compile_files
 	python_copy_sources
 }
 



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: dev-python/pyatspi/, dev-python/pyatspi/files/
@ 2013-11-25 23:50 Gilles Dartiguelongue
  0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-25 23:50 UTC (permalink / raw
  To: gentoo-commits

commit:     29f11fa1131ae9e71dde92c321564571e23e5781
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 23:48:46 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 23:49:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=29f11fa1

dev-python/pyatspi: 2.8.0 → 2.10.0

---
 .../files/pyatspi-2.6.0-examples-python3.patch     | 26 ++++++++++
 dev-python/pyatspi/metadata.xml                    |  5 ++
 dev-python/pyatspi/pyatspi-2.10.0.ebuild           | 59 ++++++++++++++++++++++
 dev-python/pyatspi/pyatspi-9999.ebuild             | 46 +++++++----------
 4 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch b/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch
new file mode 100644
index 0000000..423cd64
--- /dev/null
+++ b/dev-python/pyatspi/files/pyatspi-2.6.0-examples-python3.patch
@@ -0,0 +1,26 @@
+From 4f10a696002179082e41568b5109400ac8478a96 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 10 Dec 2012 04:52:03 -0500
+Subject: [PATCH] examples: support python2 and python3 syntax
+
+https://bugzilla.gnome.org/show_bug.cgi?id=689957
+---
+ examples/magFocusTracker.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/magFocusTracker.py b/examples/magFocusTracker.py
+index 47efe00..7ca3b67 100755
+--- a/examples/magFocusTracker.py
++++ b/examples/magFocusTracker.py
+@@ -282,7 +282,7 @@ def main():
+             startTracking()
+         pyatspi.Registry.start()
+     else:
+-        print 'Magnification service not available. Exiting.'
++        print('Magnification service not available. Exiting.')
+ 
+     return 0
+ 
+-- 
+1.8.0
+

diff --git a/dev-python/pyatspi/metadata.xml b/dev-python/pyatspi/metadata.xml
new file mode 100644
index 0000000..d9f21e6
--- /dev/null
+++ b/dev-python/pyatspi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome-accessibility</herd>
+</pkgmetadata>

diff --git a/dev-python/pyatspi/pyatspi-2.10.0.ebuild b/dev-python/pyatspi/pyatspi-2.10.0.ebuild
new file mode 100644
index 0000000..c2ccc44
--- /dev/null
+++ b/dev-python/pyatspi/pyatspi-2.10.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="Python binding to at-spi library"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+# Note: only some of the tests are GPL-licensed, everything else is LGPL
+LICENSE="LGPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# test suite is obsolete (at-spi-1.x era) and unpassable
+RESTRICT="test"
+
+COMMON_DEPEND="
+	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]
+	!<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
+	epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+
+	docinto examples
+	dodoc examples/*.py
+}

diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild b/dev-python/pyatspi/pyatspi-9999.ebuild
index c1ed047..80dceb8 100644
--- a/dev-python/pyatspi/pyatspi-9999.ebuild
+++ b/dev-python/pyatspi/pyatspi-9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5 3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-jython *-pypy-*"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit gnome2 python
+inherit eutils gnome2 python-r1
 if [[ ${PV} = 9999 ]]; then
 	GNOME_LIVE_MODULE="pyatspi2"
 	inherit gnome2-live
@@ -23,15 +21,18 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 IUSE="" # test
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # test suite is obsolete (at-spi-1.x era) and unpassable
 RESTRICT="test"
 
-COMMON_DEPEND="dev-python/dbus-python
-	>=dev-python/pygobject-2.90.1:3
+COMMON_DEPEND="
+	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,37 +42,26 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-tests"
-	python_pkg_setup
-}
-
 src_prepare() {
+	# https://bugzilla.gnome.org/show_bug.cgi?id=689957
+	epatch "${FILESDIR}/${PN}-2.6.0-examples-python3.patch"
+
 	gnome2_src_prepare
 
-	python_clean_py-compile_files
 	python_copy_sources
 }
 
 src_configure() {
-	python_execute_function -s gnome2_src_configure
+	python_foreach_impl run_in_build_dir gnome2_src_configure --disable-tests
 }
 
 src_compile() {
-	python_execute_function -s gnome2_src_compile
+	python_foreach_impl run_in_build_dir gnome2_src_compile
 }
 
 src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize pyatspi
-}
+	python_foreach_impl run_in_build_dir gnome2_src_install
 
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup pyatspi
+	docinto examples
+	dodoc examples/*.py
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-11-25 23:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-25 23:50 [gentoo-commits] proj/gnome:master commit in: dev-python/pyatspi/, dev-python/pyatspi/files/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2012-05-24  9:11 Alexandre Restovtsev
2011-10-03 20:52 Alexandre Restovtsev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox