From 61bebdc5df9032a5bc2653d94f8d1641560837f1 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sun, 17 Oct 2010 18:22:19 +0000 Subject: Finally let orca work when python3 is the preferred interpreter (bug #308261), thanks a lot to Arfrever Frehtes Taifersar Arahesis for finding the fix. (Portage version: 2.1.9.19/cvs/Linux x86_64) --- app-accessibility/orca/ChangeLog | 10 +++- app-accessibility/orca/orca-2.32.0-r1.ebuild | 81 +++++++++++++++++++++++++++ app-accessibility/orca/orca-2.32.0.ebuild | 83 ---------------------------- 3 files changed, 90 insertions(+), 84 deletions(-) create mode 100644 app-accessibility/orca/orca-2.32.0-r1.ebuild delete mode 100644 app-accessibility/orca/orca-2.32.0.ebuild (limited to 'app-accessibility') diff --git a/app-accessibility/orca/ChangeLog b/app-accessibility/orca/ChangeLog index d3485c2db743..a1e8fabad644 100644 --- a/app-accessibility/orca/ChangeLog +++ b/app-accessibility/orca/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-accessibility/orca # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.92 2010/10/17 15:07:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/ChangeLog,v 1.93 2010/10/17 18:22:19 pacho Exp $ + +*orca-2.32.0-r1 (17 Oct 2010) + + 17 Oct 2010; Pacho Ramos -orca-2.32.0.ebuild, + +orca-2.32.0-r1.ebuild: + Finally let orca work when python3 is the preferred interpreter (bug + #308261), thanks a lot to Arfrever Frehtes Taifersar Arahesis for finding + the fix. 17 Oct 2010; Raúl Porcel orca-2.30.2.ebuild: alpha/ia64/sparc stable wrt #324077 diff --git a/app-accessibility/orca/orca-2.32.0-r1.ebuild b/app-accessibility/orca/orca-2.32.0-r1.ebuild new file mode 100644 index 000000000000..897b1450f063 --- /dev/null +++ b/app-accessibility/orca/orca-2.32.0-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-2.32.0-r1.ebuild,v 1.1 2010/10/17 18:22:19 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" +PYTHON_DEPEND="2" + +inherit gnome2 python + +DESCRIPTION="Extensible screen reader that provides access to the desktop" +HOMEPAGE="http://www.gnome.org/projects/orca/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +# liblouis is not in portage yet +# it is used to provide contracted braille support +RDEPEND=">=dev-libs/glib-2.10 + >=gnome-extra/at-spi-1.24 + >=gnome-base/orbit-2 + >=dev-python/pyorbit-2.24 + >=gnome-base/libbonobo-2.24 + >=dev-python/libbonobo-python-2.24 + + dev-python/pygobject + dev-python/pycairo + >=dev-python/dbus-python-0.83 + >=dev-python/pygtk-2.12 + + >=dev-python/libwnck-python-2.24 + >=dev-python/gconf-python-2.24 + >=dev-python/libgnome-python-2.14 + + >=app-accessibility/gnome-speech-0.3.10 + >=app-accessibility/gnome-mag-0.12.5" + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.9" + +pkg_setup() { + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO" + python_set_active_version 2 +} + +src_prepare() { + gnome2_src_prepare + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile +} + +src_configure() { + # FIXME: Workaround for bug #325611 until root cause is found + addpredict "$(unset HOME; echo ~)/.gconf" + addpredict "$(unset HOME; echo ~)/.gconfd" + # Needed for import pyatspi + unset DBUS_SESSION_BUS_ADDRESS + PYTHON="$(PYTHON)" gnome2_src_configure +} + +src_compile() { + # FIXME: Workaround for bug #325611 until root cause is found + addpredict "$(unset HOME; echo ~)/.gconf" + addpredict "$(unset HOME; echo ~)/.gconfd" + gnome2_src_compile +} + +pkg_postinst() { + gnome2_pkg_postinst + python_mod_optimize "${PN}" +} + +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup "${PN}" +} diff --git a/app-accessibility/orca/orca-2.32.0.ebuild b/app-accessibility/orca/orca-2.32.0.ebuild deleted file mode 100644 index 9139a03e4544..000000000000 --- a/app-accessibility/orca/orca-2.32.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-2.32.0.ebuild,v 1.2 2010/10/13 20:58:07 eva Exp $ - -EAPI="3" -GCONF_DEBUG="no" -PYTHON_DEPEND="2" - -inherit gnome2 python - -DESCRIPTION="Extensible screen reader that provides access to the desktop" -HOMEPAGE="http://www.gnome.org/projects/orca/" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" - -# liblouis is not in portage yet -# it is used to provide contracted braille support -RDEPEND=">=dev-libs/glib-2.10 - >=gnome-extra/at-spi-1.24 - >=gnome-base/orbit-2 - >=dev-python/pyorbit-2.24 - >=gnome-base/libbonobo-2.24 - >=dev-python/libbonobo-python-2.24 - - dev-python/pygobject - dev-python/pycairo - >=dev-python/dbus-python-0.83 - >=dev-python/pygtk-2.12 - - >=dev-python/libwnck-python-2.24 - >=dev-python/gconf-python-2.24 - >=dev-python/libgnome-python-2.14 - - >=app-accessibility/gnome-speech-0.3.10 - >=app-accessibility/gnome-mag-0.12.5" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.9" - -pkg_setup() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO" - python_set_active_version 2 -} - -src_prepare() { - gnome2_src_prepare - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile - - python_convert_shebangs -r 2 . -} - -src_configure() { - # FIXME: Workaround for bug #325611 until root cause is found - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - # Needed for import pyatspi - unset DBUS_SESSION_BUS_ADDRESS - gnome2_src_configure -} - -src_compile() { - # FIXME: Workaround for bug #325611 until root cause is found - addpredict "$(unset HOME; echo ~)/.gconf" - addpredict "$(unset HOME; echo ~)/.gconfd" - gnome2_src_compile -} - -pkg_postinst() { - gnome2_pkg_postinst - python_mod_optimize "${PN}" -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup "${PN}" -} -- cgit v1.2.3-65-gdbad