Update to 2.18.0:

2.18.0 24-may-2009
        - Improve gio docs with some more classes (Gian)
        - Wrap gio.OutputStream.splice_async() (Gian)
        - Add Python ver into installed libpyglib name (Emilio Pozuelo Monfort)
        - Wrap gio.OutputStream.flush_async() (Gian)
        - Use 'Requires.private' for libffi in '.pc' files (Josselin Mouette)
        - Add wrapper for gio.FileAttributeMatcher (Gian)
        - Mark relevant glib.IOChannel methods as METH_NOARGS (Paul)
        - Retire hand-written ChangeLog; autocreate from Git history (Paul)
        - Wrap gio.InputStream.skip_async() (Gian)
        - Add in codegen -n --namespace option and the code to remove dll
          API in headers, added documentation (Siavash Safi)
        - Properly mark glib.get_user_special_dir() as a keywords method (Paul)

2.17.0 30-apr-2009
        - Write a good part of the docs for gio (Gian)
        - Wrap g_mount_guess_content_type g_mount_guess_content_type_finish
          g_mount_guess_content_type_sync (Gian, #580802)
        - Swap first two arguments of gio.File.query_info_async (Paul, #580490)
        - Fix a crash in pyg_type_add_interfaces (Paul, #566571)
        - Remove an empty structure, use sizeof(PyObject)
          instead (Paul, #560591)
        - Wrap four g_get_user_*_dir() functions (Paul, #575999)
        - Remove 'ltihooks.py' as using deprecated Python module (Paul)
        - Code maintenance: add .gitignore files (Paul)
        - CellRendererPixbuf stock-size property has wrong type (Paul, #568499)
        - Add a doap file after git migration (Johan Dahlin)
        - missing dep on libffi in pygobject-2.0.pc (Götz Waschk, #550231)
        - g_volume_monitor_tp_new new function, return the singleton object.
          (Paul, #555613)
        - Remove a DeprecationWarning under python 2.6 (James Westby, #573753)
        - several scripts from codegen directory are not distributed
          (Krzesimir Nowak)
        - g_file_copy_async change argument order to keep it consistent with the
          other methods (Gian)
        - memory leak in gio.File.copy_async (Paul Pogonyshev, #578870)
        - g_file_monitor should accept None for cancellable and set the default
          flag to G_FILE_MONITOR_NONE (Gian)
        - pyg_notify_free needs to ensure it has GIL before calling Py_XDECREF
          (Jonathan Matthew)
        - Wrap g_file_set_display_name_async (Gian)
        - Add a semi-private method to return the option context C object from
          an option context wrapper (Tristan Hill)
        - Converting a negative long Python value to a GUINT64 GValue doesn't
          error out as it should (Gustavo J. A. M. Carneiro, #577999)
        - Wrap g_file_set_attributes_async and
          g_file_set_attributes_finish (Gian)
        - g_file_query_filesystem_info_async fix a typo (Gian)
        - Wrap g_file_query_filesystem_info_async (Gian)
        - Add missing g_file_query_filesystem_info_async and
	  g_file_query_filesystem_info_finish (Gian)
        - Wrap g_file_eject_mountable (Gian)
        - g_file_copy callback cannot be optional (Gian)
        - Swap various kwargs names to reflect the code (Gian)
        - Update the address of the FSF (Tobias Mueller, #577134)
        - Add g_volume_should_automount (Gian)
        - Wrap g_drive_enumerate_identifiers and g_volume_enumerate_identifiers
          (Gian)
	- Add a couple of convinence functions to convert from/to a python list
	  and an array of strings (Gian)
	- Allow setting pytype wrapper class (Mark Lee, John Ehresman, #559001)
	- Wrap g_file_enumerator_close_async (Gian Mario Tagliaretti)

8 files changed, 72 insertions, 38 deletions

diff --git a/devel/py-gobject-shared/Makefile b/devel/py-gobject-shared/Makefile
index 057718e8475..494957c1bd0 100644
--- a/devel/py-gobject-shared/Makefile
+++ b/devel/py-gobject-shared/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2009/02/22 13:59:47 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/06/09 13:25:02 wiz Exp $
 
-PKGNAME=		py-gobject-shared-2.16.1
+PKGNAME=		py-gobject-shared-2.18.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 35769dca441..f1821d06c9e 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/02/22 13:59:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/06/09 13:25:02 wiz Exp $
 #
 
-PKGNAME=		${PYPKGPREFIX}-gobject-2.16.1
+PKGNAME=		${PYPKGPREFIX}-gobject-2.18.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
index 8a8295f317a..1d2070d6db3 100644
--- a/devel/py-gobject/Makefile.common
+++ b/devel/py-gobject/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.12 2009/02/22 13:59:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2009/06/09 13:25:02 wiz Exp $
 #
 # used by devel/py-gobject/Makefile
 # used by devel/py-gobject-shared/Makefile
 
-DISTNAME=		pygobject-2.16.1
+DISTNAME=		pygobject-2.18.0
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/2.16/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/pygobject/2.18/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.pygtk.org/
@@ -22,4 +22,5 @@ DISTINFO_FILE=		${.CURDIR}/../../devel/py-gobject/distinfo
 
 PKGCONFIG_OVERRIDE+=	pygobject-2.0.pc.in
 PY_PATCHPLIST=		yes
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
diff --git a/devel/py-gobject/PLIST b/devel/py-gobject/PLIST
index 18968a58e7d..5288f3bdc6b 100644
--- a/devel/py-gobject/PLIST
+++ b/devel/py-gobject/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2008/10/16 13:52:05 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/06/09 13:25:02 wiz Exp $
 bin/pygobject-codegen-2.0
 include/pygtk-2.0/pyglib.h
-lib/libpyglib-2.0.la
+lib/libpyglib-2.0-python${PYVERSSUFFIX}.la
 ${PYSITELIB}/gtk-2.0/dsextras.py
 ${PYSITELIB}/gtk-2.0/dsextras.pyc
 ${PYSITELIB}/gtk-2.0/dsextras.pyo
@@ -31,12 +31,39 @@ ${PYSITELIB}/pygtk.pth
 ${PYSITELIB}/pygtk.py
 ${PYSITELIB}/pygtk.pyc
 ${PYSITELIB}/pygtk.pyo
+share/gtk-doc/html/pygobject/class-gioappinfo.html
+share/gtk-doc/html/pygobject/class-gioapplaunchcontext.html
+share/gtk-doc/html/pygobject/class-gioasyncresult.html
+share/gtk-doc/html/pygobject/class-giocancellable.html
+share/gtk-doc/html/pygobject/class-giodrive.html
+share/gtk-doc/html/pygobject/class-gioemblem.html
+share/gtk-doc/html/pygobject/class-gioemblemedicon.html
+share/gtk-doc/html/pygobject/class-giofile.html
+share/gtk-doc/html/pygobject/class-giofileattributeinfo.html
+share/gtk-doc/html/pygobject/class-giofileenumerator.html
+share/gtk-doc/html/pygobject/class-giofileicon.html
+share/gtk-doc/html/pygobject/class-giofileinfo.html
+share/gtk-doc/html/pygobject/class-giofilemonitor.html
+share/gtk-doc/html/pygobject/class-gioicon.html
+share/gtk-doc/html/pygobject/class-gioinputstream.html
+share/gtk-doc/html/pygobject/class-gioloadableicon.html
+share/gtk-doc/html/pygobject/class-giomount.html
+share/gtk-doc/html/pygobject/class-giomountoperation.html
+share/gtk-doc/html/pygobject/class-giooutputstream.html
+share/gtk-doc/html/pygobject/class-gioseekable.html
+share/gtk-doc/html/pygobject/class-giosimpleasyncresult.html
+share/gtk-doc/html/pygobject/class-giothemedicon.html
+share/gtk-doc/html/pygobject/class-giovolume.html
+share/gtk-doc/html/pygobject/class-giovolumemonitor.html
 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/gio-class-reference.html
+share/gtk-doc/html/pygobject/gio-constants.html
+share/gtk-doc/html/pygobject/glib-class-reference.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
@@ -53,6 +80,9 @@ 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/code-coverage.py
+share/pygobject/2.0/codegen/code-coverage.pyc
+share/pygobject/2.0/codegen/code-coverage.pyo
 share/pygobject/2.0/codegen/codegen.py
 share/pygobject/2.0/codegen/codegen.pyc
 share/pygobject/2.0/codegen/codegen.pyo
@@ -62,12 +92,21 @@ 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/defsconvert.py
+share/pygobject/2.0/codegen/defsconvert.pyc
+share/pygobject/2.0/codegen/defsconvert.pyo
+share/pygobject/2.0/codegen/defsgen.py
+share/pygobject/2.0/codegen/defsgen.pyc
+share/pygobject/2.0/codegen/defsgen.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/docextract_to_xml.py
+share/pygobject/2.0/codegen/docextract_to_xml.pyc
+share/pygobject/2.0/codegen/docextract_to_xml.pyo
 share/pygobject/2.0/codegen/docgen.py
 share/pygobject/2.0/codegen/docgen.pyc
 share/pygobject/2.0/codegen/docgen.pyo
@@ -77,6 +116,9 @@ 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/missingdefs.py
+share/pygobject/2.0/codegen/missingdefs.pyc
+share/pygobject/2.0/codegen/missingdefs.pyo
 share/pygobject/2.0/codegen/mkskel.py
 share/pygobject/2.0/codegen/mkskel.pyc
 share/pygobject/2.0/codegen/mkskel.pyo
@@ -86,11 +128,15 @@ 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/scanvirtuals.py
+share/pygobject/2.0/codegen/scanvirtuals.pyc
+share/pygobject/2.0/codegen/scanvirtuals.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/gdrive.override
 share/pygobject/2.0/defs/gfile.override
 share/pygobject/2.0/defs/gfileattribute.override
 share/pygobject/2.0/defs/gfileenumerator.override
@@ -100,6 +146,7 @@ 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/gmount.override
 share/pygobject/2.0/defs/goutputstream.override
 share/pygobject/2.0/defs/gvolume.override
 share/pygobject/2.0/defs/gvolumemonitor.override
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 6b35ac42398..9f3f5be80a9 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.15 2009/02/22 13:59:47 wiz Exp $
+$NetBSD: distinfo,v 1.16 2009/06/09 13:25:02 wiz Exp $
 
-SHA1 (pygobject-2.16.1.tar.gz) = 5c073d4de859f4455a4d0bd60617a254d18d99e3
-RMD160 (pygobject-2.16.1.tar.gz) = a5e0919848abe0a538a3729e41c7f3e1f2be6a37
-Size (pygobject-2.16.1.tar.gz) = 644722 bytes
-SHA1 (patch-aa) = 7017840985a985ef92ec8983dd8f4d8763c38ed3
-SHA1 (patch-ab) = 6e547a4e1fdfc7e6754805f9bc1244bbcf13a916
+SHA1 (pygobject-2.18.0.tar.gz) = a9e2d4f3b3daa8da482408feecf3a2a9ed7d07ea
+RMD160 (pygobject-2.18.0.tar.gz) = 67308ee082f5d8291b03feeb13e09c7f39a697d2
+Size (pygobject-2.18.0.tar.gz) = 823544 bytes
+SHA1 (patch-aa) = a706cc4cd48121f21d12027c315dfe92d34157ed
+SHA1 (patch-ab) = cda1c31ff28c40bbd5b7190d765e80376d9d9626
 SHA1 (patch-ac) = a2353cb390ab1d85483ec15b1c07c3a9e3373567
-SHA1 (patch-ad) = 3f8e9dd03c531198c1d1ec238d9f66fa62779785
diff --git a/devel/py-gobject/patches/patch-aa b/devel/py-gobject/patches/patch-aa
index b5cef08c404..d672f2b3bce 100644
--- a/devel/py-gobject/patches/patch-aa
+++ b/devel/py-gobject/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2009/01/07 21:28:57 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2009/06/09 13:25:02 wiz Exp $
 
---- Makefile.in.orig	2009-01-04 21:34:58.000000000 +0100
+--- Makefile.in.orig	2009-05-24 20:37:47.000000000 +0000
 +++ Makefile.in
-@@ -816,7 +816,7 @@ info: info-recursive
+@@ -820,7 +820,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 01522fe2727..1c5b9ed15f9 100644
--- a/devel/py-gobject/patches/patch-ab
+++ b/devel/py-gobject/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2009/01/07 21:28:57 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2009/06/09 13:25:02 wiz Exp $
 
---- gobject/Makefile.in.orig	2009-01-04 21:34:58.000000000 +0100
+--- gobject/Makefile.in.orig	2009-05-24 20:37:47.000000000 +0000
 +++ gobject/Makefile.in
-@@ -693,7 +693,7 @@ info: info-am
+@@ -689,7 +689,7 @@ info: info-am
  info-am:
  
  install-data-am: install-nodist_pygobjectPYTHON \
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.5 2009/01/07 21:28:57 wiz Exp $
 +	install-pygobjectLTLIBRARIES \
  	install-pygobjectPYTHON
  
- install-exec-am:
+ install-dvi: install-dvi-am
diff --git a/devel/py-gobject/patches/patch-ad b/devel/py-gobject/patches/patch-ad
deleted file mode 100644
index 7b4a3661b38..00000000000
--- a/devel/py-gobject/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/01/20 17:13:30 sketch Exp $
-
---- gobject/pygobject.c.orig	Tue Jan 20 17:08:43 2009
-+++ gobject/pygobject.c	Tue Jan 20 17:10:08 2009
-@@ -419,7 +419,7 @@
-     0
- };
- 
--struct empty {} _empty;
-+struct empty {char notreally;} _empty;
- PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, _empty);
- 
- static PyObject *