Bump to pygobject-2.26.0-r1

- Fix crash in programs like rhythmbox using it, due to bad instance property
  bindings. Bug #344459

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

3 files changed, 155 insertions, 1 deletions

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index 55dbd4b85f84..d228cde327aa 100644
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.103 2010/11/06 00:07:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.104 2010/11/08 13:23:18 dang Exp $
+
+*pygobject-2.26.0-r1 (08 Nov 2010)
+
+  08 Nov 2010; Daniel Gryniewicz <dang@gentoo.org>
+  +pygobject-2.26.0-r1.ebuild, +files/pygobject-2.26.0-nocrash.patch:
+  Bump to pygobject-2.26.0-r1
+  - Fix crash in programs like rhythmbox using it, due to bad instance
+  property
+
+  bindings. Bug #344459
+
 
 *pygobject-2.26.0 (06 Nov 2010)
 
diff --git a/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch b/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch
new file mode 100644
index 000000000000..8698b7e3a190
--- /dev/null
+++ b/dev-python/pygobject/files/pygobject-2.26.0-nocrash.patch
@@ -0,0 +1,12 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN pygobject-2.26.0.orig/gi/pygi.h pygobject-2.26.0/gi/pygi.h
+--- pygobject-2.26.0.orig/gi/pygi.h	2010-09-14 11:53:21.000000000 -0400
++++ pygobject-2.26.0/gi/pygi.h	2010-11-08 08:16:13.360808932 -0500
+@@ -152,7 +152,7 @@ static inline PyObject *
+ pygi_get_property_value (PyGObject *instance,
+                          const gchar *attr_name)
+ {
+-    return -1;
++    return NULL;
+ }
+ 
+ static inline gint
diff --git a/dev-python/pygobject/pygobject-2.26.0-r1.ebuild b/dev-python/pygobject/pygobject-2.26.0-r1.ebuild
new file mode 100644
index 000000000000..44032754aad7
--- /dev/null
+++ b/dev-python/pygobject/pygobject-2.26.0-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.26.0-r1.ebuild,v 1.1 2010/11/08 13:23:18 dang Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit alternatives autotools gnome2 python virtualx
+
+DESCRIPTION="GLib's GObject library bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc cairo examples +introspection libffi test"
+
+RDEPEND=">=dev-libs/glib-2.22.4:2
+	!<dev-python/pygtk-2.13
+	introspection? (
+		>=dev-libs/gobject-introspection-0.9.5
+		cairo? ( >=dev-python/pycairo-1.0.2 ) )
+	libffi? ( virtual/libffi )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		>=app-text/docbook-xsl-stylesheets-1.70.1 )
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc )
+	>=dev-util/pkgconfig-0.12"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog* NEWS README"
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		$(use_enable doc docs)
+		$(use_enable cairo)
+		$(use_enable introspection)
+		$(use_with libffi ffi)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix FHS compliance, see upstream bug #535524
+	epatch "${FILESDIR}/${PN}-2.15.4-fix-codegen-location.patch"
+
+	# Do not build tests if unneeded, bug #226345
+	epatch "${FILESDIR}/${PN}-2.26.0-make_check.patch"
+
+	# Support installation for multiple Python versions
+	epatch "${FILESDIR}/${PN}-2.18.0-support_multiple_python_versions.patch"
+
+	# Disable non-working tests
+	epatch "${FILESDIR}/${PN}-2.26.0-disable-non-working-tests.patch"
+
+	# Fix crash in instance property; bug# 344459
+	epatch "${FILESDIR}/${PN}-2.26.0-nocrash.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	eautoreconf
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	testing() {
+		if has ${PYTHON_ABI} 2.4 2.5; then
+			einfo "Skipping tests with Python ${PYTHON_ABI}. dev-python/pycairo supports only Python >=2.6."
+			return 0
+		fi
+
+		XDG_CACHE_HOME="${T}/$(PYTHON --ABI)"
+		Xemake check PYTHON=$(PYTHON -a)
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	[[ -z ${ED} ]] && local ED="${D}"
+	installation() {
+		gnome2_src_install
+		mv "${ED}$(python_get_sitedir)/pygtk.py" "${ED}$(python_get_sitedir)/pygtk.py-2.0"
+		mv "${ED}$(python_get_sitedir)/pygtk.pth" "${ED}$(python_get_sitedir)/pygtk.pth-2.0"
+	}
+	python_execute_function -s installation
+
+	python_clean_installation_image
+
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	create_symlinks() {
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+
+	python_mod_optimize gtk-2.0 pygtk.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup gtk-2.0 pygtk.py
+
+	create_symlinks() {
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+		alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+	}
+	python_execute_function create_symlinks
+}