diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-10-11 10:37:08 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-11 10:37:08 +0000 |
| commit | c48bc309ebcbc532ea16d379524fff55d2f1ea6f (patch) | |
| tree | 279f461e39f68c3d3e525c91d689a702b7f91d3c /dev-python | |
| parent | Merge from Prefix (diff) | |
| download | gentoo-2-c48bc309ebcbc532ea16d379524fff55d2f1ea6f.tar.gz gentoo-2-c48bc309ebcbc532ea16d379524fff55d2f1ea6f.tar.bz2 gentoo-2-c48bc309ebcbc532ea16d379524fff55d2f1ea6f.zip | |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pygobject/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pygobject/pygobject-2.18.0-r2.ebuild | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog index 815c9f8a5ecd..872b85795e99 100644 --- a/dev-python/pygobject/ChangeLog +++ b/dev-python/pygobject/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pygobject # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.80 2009/09/22 04:40:05 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.81 2009/10/11 10:37:08 grobian Exp $ + + 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> + pygobject-2.18.0-r2.ebuild: + Merge from Prefix 21 Sep 2009; Tom Gall <tgall@gentoo.org> pygobject-2.18.0.ebuild: stable on ppc64, bug #277947 diff --git a/dev-python/pygobject/pygobject-2.18.0-r2.ebuild b/dev-python/pygobject/pygobject-2.18.0-r2.ebuild index 52f58cee3524..e92104bf0a85 100644 --- a/dev-python/pygobject/pygobject-2.18.0-r2.ebuild +++ b/dev-python/pygobject/pygobject-2.18.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0-r2.ebuild,v 1.1 2009/08/28 17:15:30 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0-r2.ebuild,v 1.2 2009/10/11 10:37:08 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -12,7 +12,7 @@ HOMEPAGE="http://www.pygtk.org/" LICENSE="LGPL-2.1" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples libffi test" RDEPEND=">=dev-lang/python-2.4.4-r5 @@ -85,10 +85,11 @@ src_test() { } src_install() { + [[ -z ${ED} ]] && local ED=${D} installation() { gnome2_src_install - mv "${D}$(python_get_sitedir)/pygtk.py" "${D}$(python_get_sitedir)/pygtk.py-2.0" - mv "${D}$(python_get_sitedir)/pygtk.pth" "${D}$(python_get_sitedir)/pygtk.pth-2.0" + mv "${ED}$(python_get_sitedir)/pygtk.py" "${D}$(python_get_sitedir)/pygtk.py-2.0" + mv "${ED}$(python_get_sitedir)/pygtk.pth" "${D}$(python_get_sitedir)/pygtk.pth-2.0" } python_execute_function -s installation @@ -97,6 +98,13 @@ src_install() { doins -r examples fi + if [[ ${CHOST} == *-darwin* ]] ; then + # our python expects a bundle + mv "${ED}"$(python_get_sitedir)/gtk-2.0/gio/_gio.{so,bundle} || die + mv "${ED}"$(python_get_sitedir)/gtk-2.0/gio/unix.{so,bundle} || die + mv "${ED}"$(python_get_sitedir)/gtk-2.0/glib/_glib.{so,bundle} || die + mv "${ED}"$(python_get_sitedir)/gtk-2.0/gobject/_gobject.{so,bundle} || die + fi } pkg_postinst() { |