update to 2.15.4

This switches to the gnome-2.24 release branch.

6 files changed, 104 insertions, 27 deletions

diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 7591c6b4c55..314c114e719 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2008/05/29 16:30:09 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/16 13:52:05 drochner Exp $
 #
 
-PKGNAME=		${PYPKGPREFIX}-gobject-2.14.2
+PKGNAME=		${PYPKGPREFIX}-gobject-2.15.4
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
index 5c96dc02e29..b57658efca2 100644
--- a/devel/py-gobject/Makefile.common
+++ b/devel/py-gobject/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2008/05/29 16:30:09 drochner Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/10/16 13:52:05 drochner Exp $
 #
 
-DISTNAME=		pygobject-2.14.2
+DISTNAME=		pygobject-2.15.4
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/2.14/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/2.15/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pygtk.org/
diff --git a/devel/py-gobject/PLIST b/devel/py-gobject/PLIST
index 24bb7484728..18968a58e7d 100644
--- a/devel/py-gobject/PLIST
+++ b/devel/py-gobject/PLIST
@@ -1,7 +1,22 @@
-@comment $NetBSD: PLIST,v 1.6 2007/10/31 20:50:17 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/10/16 13:52:05 drochner Exp $
+bin/pygobject-codegen-2.0
+include/pygtk-2.0/pyglib.h
+lib/libpyglib-2.0.la
 ${PYSITELIB}/gtk-2.0/dsextras.py
 ${PYSITELIB}/gtk-2.0/dsextras.pyc
 ${PYSITELIB}/gtk-2.0/dsextras.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
@@ -9,9 +24,6 @@ ${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/option.py
-${PYSITELIB}/gtk-2.0/gobject/option.pyc
-${PYSITELIB}/gtk-2.0/gobject/option.pyo
 ${PYSITELIB}/gtk-2.0/gobject/propertyhelper.py
 ${PYSITELIB}/gtk-2.0/gobject/propertyhelper.pyc
 ${PYSITELIB}/gtk-2.0/gobject/propertyhelper.pyo
@@ -19,12 +31,14 @@ ${PYSITELIB}/pygtk.pth
 ${PYSITELIB}/pygtk.py
 ${PYSITELIB}/pygtk.pyc
 ${PYSITELIB}/pygtk.pyo
+share/gtk-doc/html/pygobject/class-glibmaincontext.html
+share/gtk-doc/html/pygobject/class-glibmainloop.html
 share/gtk-doc/html/pygobject/class-gobject.html
 share/gtk-doc/html/pygobject/class-gobjectgboxed.html
 share/gtk-doc/html/pygobject/class-gobjectginterface.html
 share/gtk-doc/html/pygobject/class-gobjectgpointer.html
-share/gtk-doc/html/pygobject/class-gobjectmaincontext.html
-share/gtk-doc/html/pygobject/class-gobjectmainloop.html
+share/gtk-doc/html/pygobject/glib-constants.html
+share/gtk-doc/html/pygobject/glib-functions.html
 share/gtk-doc/html/pygobject/gobject-class-reference.html
 share/gtk-doc/html/pygobject/gobject-constants.html
 share/gtk-doc/html/pygobject/gobject-functions.html
@@ -33,6 +47,65 @@ share/gtk-doc/html/pygobject/index.sgml
 share/gtk-doc/html/pygobject/pygobject-introduction.html
 share/gtk-doc/html/pygobject/pygobject.devhelp
 share/gtk-doc/html/pygobject/style.css
+share/pygobject/2.0/codegen/__init__.py
+share/pygobject/2.0/codegen/__init__.pyc
+share/pygobject/2.0/codegen/__init__.pyo
+share/pygobject/2.0/codegen/argtypes.py
+share/pygobject/2.0/codegen/argtypes.pyc
+share/pygobject/2.0/codegen/argtypes.pyo
+share/pygobject/2.0/codegen/codegen.py
+share/pygobject/2.0/codegen/codegen.pyc
+share/pygobject/2.0/codegen/codegen.pyo
+share/pygobject/2.0/codegen/createdefs.py
+share/pygobject/2.0/codegen/createdefs.pyc
+share/pygobject/2.0/codegen/createdefs.pyo
+share/pygobject/2.0/codegen/definitions.py
+share/pygobject/2.0/codegen/definitions.pyc
+share/pygobject/2.0/codegen/definitions.pyo
+share/pygobject/2.0/codegen/defsparser.py
+share/pygobject/2.0/codegen/defsparser.pyc
+share/pygobject/2.0/codegen/defsparser.pyo
+share/pygobject/2.0/codegen/docextract.py
+share/pygobject/2.0/codegen/docextract.pyc
+share/pygobject/2.0/codegen/docextract.pyo
+share/pygobject/2.0/codegen/docgen.py
+share/pygobject/2.0/codegen/docgen.pyc
+share/pygobject/2.0/codegen/docgen.pyo
+share/pygobject/2.0/codegen/h2def.py
+share/pygobject/2.0/codegen/h2def.pyc
+share/pygobject/2.0/codegen/h2def.pyo
+share/pygobject/2.0/codegen/mergedefs.py
+share/pygobject/2.0/codegen/mergedefs.pyc
+share/pygobject/2.0/codegen/mergedefs.pyo
+share/pygobject/2.0/codegen/mkskel.py
+share/pygobject/2.0/codegen/mkskel.pyc
+share/pygobject/2.0/codegen/mkskel.pyo
+share/pygobject/2.0/codegen/override.py
+share/pygobject/2.0/codegen/override.pyc
+share/pygobject/2.0/codegen/override.pyo
+share/pygobject/2.0/codegen/reversewrapper.py
+share/pygobject/2.0/codegen/reversewrapper.pyc
+share/pygobject/2.0/codegen/reversewrapper.pyo
+share/pygobject/2.0/codegen/scmexpr.py
+share/pygobject/2.0/codegen/scmexpr.pyc
+share/pygobject/2.0/codegen/scmexpr.pyo
+share/pygobject/2.0/defs/gappinfo.override
+share/pygobject/2.0/defs/gapplaunchcontext.override
+share/pygobject/2.0/defs/gfile.override
+share/pygobject/2.0/defs/gfileattribute.override
+share/pygobject/2.0/defs/gfileenumerator.override
+share/pygobject/2.0/defs/gfileinfo.override
+share/pygobject/2.0/defs/gicon.override
+share/pygobject/2.0/defs/ginputstream.override
+share/pygobject/2.0/defs/gio-types.defs
+share/pygobject/2.0/defs/gio.defs
+share/pygobject/2.0/defs/gio.override
+share/pygobject/2.0/defs/goutputstream.override
+share/pygobject/2.0/defs/gvolume.override
+share/pygobject/2.0/defs/gvolumemonitor.override
+share/pygobject/2.0/defs/unix-types.defs
+share/pygobject/2.0/defs/unix.defs
+share/pygobject/2.0/defs/unix.override
 share/pygobject/xsl/common.xsl
 share/pygobject/xsl/devhelp.xsl
 share/pygobject/xsl/fixxref.py
@@ -41,7 +114,11 @@ share/pygobject/xsl/pdf-style.xsl
 share/pygobject/xsl/pdf.xsl
 share/pygobject/xsl/ref-html-style.xsl
 @dirrm share/pygobject/xsl
+@dirrm share/pygobject/2.0/defs
+@dirrm share/pygobject/2.0/codegen
+@dirrm share/pygobject/2.0
 @dirrm share/pygobject
 @dirrm share/gtk-doc/html/pygobject
 @dirrm ${PYSITELIB}/gtk-2.0/gobject
-@dirrm ${PYSITELIB}/gtk-2.0
+@dirrm ${PYSITELIB}/gtk-2.0/glib
+@dirrm ${PYSITELIB}/gtk-2.0/gio
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 98b204ef47a..825e38096ba 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2008/05/29 16:30:09 drochner Exp $
+$NetBSD: distinfo,v 1.12 2008/10/16 13:52:05 drochner Exp $
 
-SHA1 (pygobject-2.14.2.tar.gz) = 70230543bf6eb707e368fc4663b21db99fc64da8
-RMD160 (pygobject-2.14.2.tar.gz) = 361b247dd6a442526b5d01d77fa585415949a57e
-Size (pygobject-2.14.2.tar.gz) = 455101 bytes
-SHA1 (patch-aa) = 421c49fa969045a33b3df26fef3d8048d9901796
-SHA1 (patch-ab) = c37fd0ee292878d197d7c6691ee9c6793f287760
+SHA1 (pygobject-2.15.4.tar.gz) = 3da6654aee9b03b578bb11bf6879e57bd939a60b
+RMD160 (pygobject-2.15.4.tar.gz) = 651b2670e8065b6519dc67ae7684097180534d56
+Size (pygobject-2.15.4.tar.gz) = 602031 bytes
+SHA1 (patch-aa) = f6ddc269a63e6655cf6beb72fa3786ff6a43ca09
+SHA1 (patch-ab) = e7aed7052b6f1cc9f4b82c4f3f48644bc1156a72
 SHA1 (patch-ac) = a2353cb390ab1d85483ec15b1c07c3a9e3373567
diff --git a/devel/py-gobject/patches/patch-aa b/devel/py-gobject/patches/patch-aa
index eaee1b01396..56ad6a8c310 100644
--- a/devel/py-gobject/patches/patch-aa
+++ b/devel/py-gobject/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2006/09/15 15:13:55 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/16 13:52:05 drochner Exp $
 
---- Makefile.in.orig	2006-09-05 00:23:22.000000000 +0200
+--- Makefile.in.orig	2008-09-03 09:51:10.000000000 +0200
 +++ Makefile.in
-@@ -747,7 +747,7 @@ info: info-recursive
+@@ -802,7 +802,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local install-pkgconfigDATA
 +install-data-am: install-data-local
  
- install-exec-am: install-exec-local install-pkgpyexecLTLIBRARIES \
- 	install-pkgpyexecPYTHON install-pyexecLTLIBRARIES \
+ install-dvi: install-dvi-recursive
+ 
diff --git a/devel/py-gobject/patches/patch-ab b/devel/py-gobject/patches/patch-ab
index d91df04264d..7c7e9e00265 100644
--- a/devel/py-gobject/patches/patch-ab
+++ b/devel/py-gobject/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2007/10/31 20:50:17 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2008/10/16 13:52:05 drochner Exp $
 
---- gobject/Makefile.in.orig	2007-09-16 13:27:26.000000000 +0200
+--- gobject/Makefile.in.orig	2008-09-03 09:51:10.000000000 +0200
 +++ gobject/Makefile.in
-@@ -986,7 +986,7 @@ info: info-am
+@@ -675,7 +675,7 @@ info: info-am
  info-am:
  
  install-data-am: install-nodist_pygobjectPYTHON \
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.3 2007/10/31 20:50:17 drochner Exp $
 +	install-pygobjectLTLIBRARIES \
  	install-pygobjectPYTHON
  
- install-exec-am:
+ install-dvi: install-dvi-am