update to 2.22.0

This switches to the gnome-2.22 release branch.

4 files changed, 27 insertions, 14 deletions

diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 687a6a0aab9..417300ae97a 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.52 2008/03/06 14:53:57 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2008/04/11 19:53:22 drochner Exp $
 #
 
-DISTNAME=	gnome-python-2.20.1
+DISTNAME=	gnome-python-2.22.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	1
 CATEGORIES=	x11 python
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	recht@NetBSD.org
diff --git a/x11/py-gnome2/PLIST b/x11/py-gnome2/PLIST
index be8a5127a3c..2349ddfc4d9 100644
--- a/x11/py-gnome2/PLIST
+++ b/x11/py-gnome2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/10/12 14:00:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/11 19:53:22 drochner Exp $
 include/gnome-python-2.0/pygnomevfs.h
 include/gnome-python-2.0/pygnomevfsbonobo.h
 lib/gnome-vfs-2.0/modules/libpythonmethod.la
@@ -27,6 +27,19 @@ ${PYSITELIB}/gtk-2.0/gnomevfs/__init__.pyc
 ${PYSITELIB}/gtk-2.0/gnomevfs/__init__.pyo
 ${PYSITELIB}/gtk-2.0/gnomevfs/_gnomevfs.la
 ${PYSITELIB}/gtk-2.0/gnomevfs/gnomevfsbonobo.la
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-context.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-directoryhandle.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-drive.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-fileinfo.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-handle.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-uri.html
+share/gtk-doc/html/pygnomevfs/class-gnomevfs-volume.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-class-reference.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-constants.html
+share/gtk-doc/html/pygnomevfs/gnomevfs-functions.html
+share/gtk-doc/html/pygnomevfs/index.html
+share/gtk-doc/html/pygnomevfs/index.sgml
+share/gtk-doc/html/pygnomevfs/pygnomevfs.devhelp
 share/pygtk/2.0/argtypes/bonobo-arg-types.py
 share/pygtk/2.0/argtypes/bonobo-arg-types.pyc
 share/pygtk/2.0/argtypes/bonobo-arg-types.pyo
@@ -44,6 +57,7 @@ share/pygtk/2.0/defs/gnome.defs
 share/pygtk/2.0/defs/ui.defs
 @comment in py-gtk2: @dirrm share/pygtk/2.0/defs
 @dirrm share/pygtk/2.0/argtypes
+@dirrm share/gtk-doc/html/pygnomevfs
 @dirrm ${PYSITELIB}/gtk-2.0/gnomevfs
 @dirrm ${PYSITELIB}/gtk-2.0/gnome
 @dirrm ${PYSITELIB}/gtk-2.0/bonobo
diff --git a/x11/py-gnome2/distinfo b/x11/py-gnome2/distinfo
index 6bee543460c..7e9392911cb 100644
--- a/x11/py-gnome2/distinfo
+++ b/x11/py-gnome2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2007/11/29 20:49:56 drochner Exp $
+$NetBSD: distinfo,v 1.16 2008/04/11 19:53:22 drochner Exp $
 
-SHA1 (gnome-python-2.20.1.tar.bz2) = 654419b0082d101d76ecc79d9fe47b0d8ea5461b
-RMD160 (gnome-python-2.20.1.tar.bz2) = aaedae48dd151af28622dbcd00afcf527b6ce5ba
-Size (gnome-python-2.20.1.tar.bz2) = 416845 bytes
+SHA1 (gnome-python-2.22.0.tar.bz2) = 824fc626ca8d3fd26a03998cad740d466cd77051
+RMD160 (gnome-python-2.22.0.tar.bz2) = 017c772a9ce8ef315885a4353378a7ee22a89acc
+Size (gnome-python-2.22.0.tar.bz2) = 539423 bytes
 SHA1 (patch-aa) = 82b02940e0dbcc87a6666be5bb282d49485b5a19
 SHA1 (patch-ab) = d547a4ac92364aed1f5d7f8041616760339aefd3
-SHA1 (patch-ac) = 6fc9caab51ee8ce40798f3f6ac9ded7d041f2fe3
+SHA1 (patch-ac) = 0f05e017831cd15d5728359dc15ba454c9c8bd19
diff --git a/x11/py-gnome2/patches/patch-ac b/x11/py-gnome2/patches/patch-ac
index a061ffa604a..234ed2c2463 100644
--- a/x11/py-gnome2/patches/patch-ac
+++ b/x11/py-gnome2/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.2 2006/10/12 14:00:06 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2008/04/11 19:53:22 drochner Exp $
 
---- gnomevfs/Makefile.in.orig	2006-09-04 23:50:39.000000000 +0200
+--- gnomevfs/Makefile.in.orig	2008-03-09 20:06:55.000000000 +0100
 +++ gnomevfs/Makefile.in
-@@ -292,9 +292,9 @@ common_ldflags = -module -avoid-version
+@@ -291,9 +291,9 @@ common_ldflags = -module -avoid-version 
  
  # libgnomevfs binding
  gnomevfs_LTLIBRARIES = _gnomevfs.la $(am__append_1)
 -_gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS)
 +_gnomevfs_la_CFLAGS = $(GNOMEVFS_CFLAGS) $(BONOBO_ACTIVATION_CFLAGS)
- _gnomevfs_la_LDFLAGS = $(common_ldflags) $(PYTHON_LDFLAGS) -export-symbols-regex init_gnomevfs
+ _gnomevfs_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gnomevfs
 -_gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(PYTHON_LIBS)
 +_gnomevfs_la_LIBADD = $(GNOMEVFS_LIBS) $(PYTHON_LIBS) $(BONOBO_ACTIVATION_LIBS)
  _gnomevfs_la_SOURCES = vfsmodule.c vfs-uri.c vfs-file-info.c vfs-dir-handle.c \