| 1 |
commit: 9b522f73464e42c18534e5c1c5f569dc28a955b6 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 3 20:49:07 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Oct 3 20:49:07 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9b522f73 |
| 7 |
|
| 8 |
dev-python/pyatspi: do not check for pygtk |
| 9 |
|
| 10 |
Upstream bug filed at https://bugzilla.gnome.org/show_bug.cgi?id=660826 |
| 11 |
Reported on IRC by Arc Riley of pysoy. |
| 12 |
|
| 13 |
--- |
| 14 |
.../files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch | 26 ++++++++++++++++++++ |
| 15 |
dev-python/pyatspi/pyatspi-2.2.0.ebuild | 6 ++++- |
| 16 |
dev-python/pyatspi/pyatspi-9999.ebuild | 6 ++++- |
| 17 |
3 files changed, 36 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..a8f68d3 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-python/pyatspi/files/pyatspi-2.2.0-AM_CHECK_PYMOD-pygtk.patch |
| 24 |
@@ -0,0 +1,26 @@ |
| 25 |
+From 484a3285a5f66ab05ab030fc9217685f02052c91 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Alexandre Rostovtsev <tetromino@×××××.com> |
| 27 |
+Date: Mon, 3 Oct 2011 16:32:23 -0400 |
| 28 |
+Subject: [PATCH] Drop unneeded pygtk check from AM_CHECK_PYMOD |
| 29 |
+ |
| 30 |
+https://bugzilla.gnome.org/show_bug.cgi?id=660826 |
| 31 |
+--- |
| 32 |
+ acinclude.m4 | 2 -- |
| 33 |
+ 1 files changed, 0 insertions(+), 2 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/acinclude.m4 b/acinclude.m4 |
| 36 |
+index 79c3c7c..6622932 100644 |
| 37 |
+--- a/acinclude.m4 |
| 38 |
++++ b/acinclude.m4 |
| 39 |
+@@ -51,8 +51,6 @@ AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ |
| 40 |
+ ifelse([$2],[], [prog=" |
| 41 |
+ import sys |
| 42 |
+ try: |
| 43 |
+- import pygtk |
| 44 |
+- pygtk.require('2.0') |
| 45 |
+ import $1 |
| 46 |
+ except ImportError: |
| 47 |
+ sys.exit(1) |
| 48 |
+-- |
| 49 |
+1.7.7 |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/dev-python/pyatspi/pyatspi-2.2.0.ebuild b/dev-python/pyatspi/pyatspi-2.2.0.ebuild |
| 53 |
index e35891c..d456fc8 100644 |
| 54 |
--- a/dev-python/pyatspi/pyatspi-2.2.0.ebuild |
| 55 |
+++ b/dev-python/pyatspi/pyatspi-2.2.0.ebuild |
| 56 |
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2:2.4" |
| 57 |
SUPPORT_PYTHON_ABIS="1" |
| 58 |
RESTRICT_PYTHON_ABIS="3.* *-jython" |
| 59 |
|
| 60 |
-inherit gnome2 python |
| 61 |
+inherit autotools eutils gnome2 python |
| 62 |
if [[ ${PV} = 9999 ]]; then |
| 63 |
GNOME_LIVE_MODULE="pyatspi2" |
| 64 |
inherit gnome2-live |
| 65 |
@@ -51,6 +51,10 @@ pkg_setup() { |
| 66 |
} |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
+ # remove pygtk cruft; https://bugzilla.gnome.org/show_bug.cgi?id=660826 |
| 70 |
+ epatch "${FILESDIR}/${PN}-2.2.0-AM_CHECK_PYMOD-pygtk.patch" |
| 71 |
+ [[ ${PV} = 9999 ]] || eautoreconf |
| 72 |
+ |
| 73 |
gnome2_src_prepare |
| 74 |
|
| 75 |
# disable pyc compiling |
| 76 |
|
| 77 |
diff --git a/dev-python/pyatspi/pyatspi-9999.ebuild b/dev-python/pyatspi/pyatspi-9999.ebuild |
| 78 |
index e35891c..d456fc8 100644 |
| 79 |
--- a/dev-python/pyatspi/pyatspi-9999.ebuild |
| 80 |
+++ b/dev-python/pyatspi/pyatspi-9999.ebuild |
| 81 |
@@ -9,7 +9,7 @@ PYTHON_DEPEND="2:2.4" |
| 82 |
SUPPORT_PYTHON_ABIS="1" |
| 83 |
RESTRICT_PYTHON_ABIS="3.* *-jython" |
| 84 |
|
| 85 |
-inherit gnome2 python |
| 86 |
+inherit autotools eutils gnome2 python |
| 87 |
if [[ ${PV} = 9999 ]]; then |
| 88 |
GNOME_LIVE_MODULE="pyatspi2" |
| 89 |
inherit gnome2-live |
| 90 |
@@ -51,6 +51,10 @@ pkg_setup() { |
| 91 |
} |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
+ # remove pygtk cruft; https://bugzilla.gnome.org/show_bug.cgi?id=660826 |
| 95 |
+ epatch "${FILESDIR}/${PN}-2.2.0-AM_CHECK_PYMOD-pygtk.patch" |
| 96 |
+ [[ ${PV} = 9999 ]] || eautoreconf |
| 97 |
+ |
| 98 |
gnome2_src_prepare |
| 99 |
|
| 100 |
# disable pyc compiling |
Archives