update to 2.28.3

This switches to the 2.28 release branch.

5 files changed, 75 insertions, 70 deletions

diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 55d97e866cf..4107caa910d 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2011/03/22 10:41:10 obache Exp $
+# $NetBSD: Makefile,v 1.32 2011/04/08 14:30:15 drochner Exp $
 #
 
-PKGNAME=		${PYPKGPREFIX}-gobject-2.26.0
-PKGREVISION=		2
+PKGNAME=		${PYPKGPREFIX}-gobject-2.28.3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
index e33d2513537..6c7734050fb 100644
--- a/devel/py-gobject/Makefile.common
+++ b/devel/py-gobject/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.16 2010/11/24 18:54:55 drochner Exp $
+# $NetBSD: Makefile.common,v 1.17 2011/04/08 14:30:15 drochner Exp $
 #
 # used by devel/py-gobject/Makefile
 # used by devel/py-gobject-shared/Makefile
 
-DISTNAME=		pygobject-2.26.0
+DISTNAME=		pygobject-2.28.3
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/2.28/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pygtk.org/
diff --git a/devel/py-gobject/PLIST b/devel/py-gobject/PLIST
index 0ffd2208531..b5c4a7ee9d7 100644
--- a/devel/py-gobject/PLIST
+++ b/devel/py-gobject/PLIST
@@ -1,67 +1,73 @@
-@comment $NetBSD: PLIST,v 1.13 2010/11/24 18:54:55 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/04/08 14:30:15 drochner Exp $
 bin/pygobject-codegen-2.0
 include/pygtk-2.0/pyglib.h
 lib/libpyglib-2.0-python${PYVERSSUFFIX}.la
+${PYSITELIB}/gi/__init__.py
+${PYSITELIB}/gi/__init__.pyc
+${PYSITELIB}/gi/__init__.pyo
+${PYSITELIB}/gi/_gi.la
+${PYSITELIB}/gi/_gi_cairo.la
+${PYSITELIB}/gi/importer.py
+${PYSITELIB}/gi/importer.pyc
+${PYSITELIB}/gi/importer.pyo
+${PYSITELIB}/gi/module.py
+${PYSITELIB}/gi/module.pyc
+${PYSITELIB}/gi/module.pyo
+${PYSITELIB}/gi/overrides/GIMarshallingTests.py
+${PYSITELIB}/gi/overrides/GIMarshallingTests.pyc
+${PYSITELIB}/gi/overrides/GIMarshallingTests.pyo
+${PYSITELIB}/gi/overrides/GLib.py
+${PYSITELIB}/gi/overrides/GLib.pyc
+${PYSITELIB}/gi/overrides/GLib.pyo
+${PYSITELIB}/gi/overrides/Gdk.py
+${PYSITELIB}/gi/overrides/Gdk.pyc
+${PYSITELIB}/gi/overrides/Gdk.pyo
+${PYSITELIB}/gi/overrides/Gio.py
+${PYSITELIB}/gi/overrides/Gio.pyc
+${PYSITELIB}/gi/overrides/Gio.pyo
+${PYSITELIB}/gi/overrides/Gtk.py
+${PYSITELIB}/gi/overrides/Gtk.pyc
+${PYSITELIB}/gi/overrides/Gtk.pyo
+${PYSITELIB}/gi/overrides/Pango.py
+${PYSITELIB}/gi/overrides/Pango.pyc
+${PYSITELIB}/gi/overrides/Pango.pyo
+${PYSITELIB}/gi/overrides/__init__.py
+${PYSITELIB}/gi/overrides/__init__.pyc
+${PYSITELIB}/gi/overrides/__init__.pyo
+${PYSITELIB}/gi/overrides/keysyms.py
+${PYSITELIB}/gi/overrides/keysyms.pyc
+${PYSITELIB}/gi/overrides/keysyms.pyo
+${PYSITELIB}/gi/repository/__init__.py
+${PYSITELIB}/gi/repository/__init__.pyc
+${PYSITELIB}/gi/repository/__init__.pyo
+${PYSITELIB}/gi/types.py
+${PYSITELIB}/gi/types.pyc
+${PYSITELIB}/gi/types.pyo
+${PYSITELIB}/glib/__init__.py
+${PYSITELIB}/glib/__init__.pyc
+${PYSITELIB}/glib/__init__.pyo
+${PYSITELIB}/glib/_glib.la
+${PYSITELIB}/glib/option.py
+${PYSITELIB}/glib/option.pyc
+${PYSITELIB}/glib/option.pyo
+${PYSITELIB}/gobject/__init__.py
+${PYSITELIB}/gobject/__init__.pyc
+${PYSITELIB}/gobject/__init__.pyo
+${PYSITELIB}/gobject/_gobject.la
+${PYSITELIB}/gobject/constants.py
+${PYSITELIB}/gobject/constants.pyc
+${PYSITELIB}/gobject/constants.pyo
+${PYSITELIB}/gobject/propertyhelper.py
+${PYSITELIB}/gobject/propertyhelper.pyc
+${PYSITELIB}/gobject/propertyhelper.pyo
 ${PYSITELIB}/gtk-2.0/dsextras.py
 ${PYSITELIB}/gtk-2.0/dsextras.pyc
 ${PYSITELIB}/gtk-2.0/dsextras.pyo
-${PYSITELIB}/gtk-2.0/gi/__init__.py
-${PYSITELIB}/gtk-2.0/gi/__init__.pyc
-${PYSITELIB}/gtk-2.0/gi/__init__.pyo
-${PYSITELIB}/gtk-2.0/gi/_gi.la
-${PYSITELIB}/gtk-2.0/gi/_gi_cairo.la
-${PYSITELIB}/gtk-2.0/gi/importer.py
-${PYSITELIB}/gtk-2.0/gi/importer.pyc
-${PYSITELIB}/gtk-2.0/gi/importer.pyo
-${PYSITELIB}/gtk-2.0/gi/module.py
-${PYSITELIB}/gtk-2.0/gi/module.pyc
-${PYSITELIB}/gtk-2.0/gi/module.pyo
-${PYSITELIB}/gtk-2.0/gi/overrides/GIMarshallingTests.py
-${PYSITELIB}/gtk-2.0/gi/overrides/GIMarshallingTests.pyc
-${PYSITELIB}/gtk-2.0/gi/overrides/GIMarshallingTests.pyo
-${PYSITELIB}/gtk-2.0/gi/overrides/GLib.py
-${PYSITELIB}/gtk-2.0/gi/overrides/GLib.pyc
-${PYSITELIB}/gtk-2.0/gi/overrides/GLib.pyo
-${PYSITELIB}/gtk-2.0/gi/overrides/Gdk.py
-${PYSITELIB}/gtk-2.0/gi/overrides/Gdk.pyc
-${PYSITELIB}/gtk-2.0/gi/overrides/Gdk.pyo
-${PYSITELIB}/gtk-2.0/gi/overrides/Gtk.py
-${PYSITELIB}/gtk-2.0/gi/overrides/Gtk.pyc
-${PYSITELIB}/gtk-2.0/gi/overrides/Gtk.pyo
-${PYSITELIB}/gtk-2.0/gi/overrides/__init__.py
-${PYSITELIB}/gtk-2.0/gi/overrides/__init__.pyc
-${PYSITELIB}/gtk-2.0/gi/overrides/__init__.pyo
-${PYSITELIB}/gtk-2.0/gi/overrides/keysyms.py
-${PYSITELIB}/gtk-2.0/gi/overrides/keysyms.pyc
-${PYSITELIB}/gtk-2.0/gi/overrides/keysyms.pyo
-${PYSITELIB}/gtk-2.0/gi/repository/__init__.py
-${PYSITELIB}/gtk-2.0/gi/repository/__init__.pyc
-${PYSITELIB}/gtk-2.0/gi/repository/__init__.pyo
-${PYSITELIB}/gtk-2.0/gi/types.py
-${PYSITELIB}/gtk-2.0/gi/types.pyc
-${PYSITELIB}/gtk-2.0/gi/types.pyo
 ${PYSITELIB}/gtk-2.0/gio/__init__.py
 ${PYSITELIB}/gtk-2.0/gio/__init__.pyc
 ${PYSITELIB}/gtk-2.0/gio/__init__.pyo
 ${PYSITELIB}/gtk-2.0/gio/_gio.la
 ${PYSITELIB}/gtk-2.0/gio/unix.la
-${PYSITELIB}/gtk-2.0/glib/__init__.py
-${PYSITELIB}/gtk-2.0/glib/__init__.pyc
-${PYSITELIB}/gtk-2.0/glib/__init__.pyo
-${PYSITELIB}/gtk-2.0/glib/_glib.la
-${PYSITELIB}/gtk-2.0/glib/option.py
-${PYSITELIB}/gtk-2.0/glib/option.pyc
-${PYSITELIB}/gtk-2.0/glib/option.pyo
-${PYSITELIB}/gtk-2.0/gobject/__init__.py
-${PYSITELIB}/gtk-2.0/gobject/__init__.pyc
-${PYSITELIB}/gtk-2.0/gobject/__init__.pyo
-${PYSITELIB}/gtk-2.0/gobject/_gobject.la
-${PYSITELIB}/gtk-2.0/gobject/constants.py
-${PYSITELIB}/gtk-2.0/gobject/constants.pyc
-${PYSITELIB}/gtk-2.0/gobject/constants.pyo
-${PYSITELIB}/gtk-2.0/gobject/propertyhelper.py
-${PYSITELIB}/gtk-2.0/gobject/propertyhelper.pyc
-${PYSITELIB}/gtk-2.0/gobject/propertyhelper.pyo
 ${PYSITELIB}/pygtk.pth
 ${PYSITELIB}/pygtk.py
 ${PYSITELIB}/pygtk.pyc
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 39ab7d46f8d..daa2daf75a5 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2010/11/24 18:54:55 drochner Exp $
+$NetBSD: distinfo,v 1.19 2011/04/08 14:30:15 drochner Exp $
 
-SHA1 (pygobject-2.26.0.tar.gz) = e6b8c031f6de45ad9cfab463a8927b6859ee8852
-RMD160 (pygobject-2.26.0.tar.gz) = 47da955e1eefd07fdab7148478e87a458708a371
-Size (pygobject-2.26.0.tar.gz) = 1055869 bytes
+SHA1 (pygobject-2.28.3.tar.gz) = 77496ef7ac5584c61dbfc7daf54c9e3e9c746f8b
+RMD160 (pygobject-2.28.3.tar.gz) = 9e09efce2d73ede1f877ebe004c0ccd4d330abc2
+Size (pygobject-2.28.3.tar.gz) = 1165669 bytes
 SHA1 (patch-aa) = a706cc4cd48121f21d12027c315dfe92d34157ed
 SHA1 (patch-ab) = f9ec40fcac11fe9d6625b6028dba2e316d9ce59e
-SHA1 (patch-ac) = a2353cb390ab1d85483ec15b1c07c3a9e3373567
+SHA1 (patch-ac) = 083e691cb13dbefeece505a7b6596c69ec8491f7
diff --git a/devel/py-gobject/patches/patch-ac b/devel/py-gobject/patches/patch-ac
index 65aa42db28d..ace964c5bb1 100644
--- a/devel/py-gobject/patches/patch-ac
+++ b/devel/py-gobject/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2007/04/10 16:42:57 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2011/04/08 14:30:16 drochner Exp $
 
---- dsextras.py.orig	2007-04-06 00:22:23.000000000 +0200
+--- dsextras.py.orig	2011-01-26 17:49:56.000000000 +0000
 +++ dsextras.py
-@@ -314,6 +314,7 @@ install PyGTK.
- ***************************************************************************
- """
+@@ -18,6 +18,7 @@ from distutils.extension import Extensio
+ from distutils.spawn import find_executable
+ 
  try:
 +    sys.path.append("@PYGTKCODEGEN@")
+     import codegen.createdefs
      from codegen.override import Overrides
      from codegen.defsparser import DefsParser
-     from codegen.codegen import register_types, SourceWriter, \