update to 2.8.4

changes:
-Split out gobject wrappers
-Bug fixes

4 files changed, 12 insertions, 24 deletions

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 2a0e8cdbafd..98fb2182208 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/02/07 21:27:28 drochner Exp $
 #
 
-DISTNAME=	pygtk-2.8.2
+DISTNAME=	pygtk-2.8.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
-PKGREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/pygtk/2.8/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,7 +15,7 @@ CONFLICTS=	${PYPKGPREFIX}-gtk<0.6.10
 
 PY_PATCHPLIST=	YES
 USE_LIBTOOL=	YES
-PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in pygobject-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	pygtk-2.0.pc.in
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 USE_TOOLS+=	gmake pkg-config
@@ -27,6 +26,7 @@ PYTHON_VERSIONS_ACCEPTED=	24 23
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
+.include "../../devel/py-gobject/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/py-gtk2/PLIST b/x11/py-gtk2/PLIST
index 74a97318970..8147f2fc492 100644
--- a/x11/py-gtk2/PLIST
+++ b/x11/py-gtk2/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2005/04/26 20:28:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/02/07 21:27:28 drochner Exp $
 bin/pygtk-codegen-2.0
 bin/pygtk-demo
-include/pygtk-2.0/pygobject.h
 include/pygtk-2.0/pygtk/pygtk.h
-lib/pkgconfig/pygobject-2.0.pc
 lib/pkgconfig/pygtk-2.0.pc
 lib/pygtk/2.0/demos/__init__.py
 lib/pygtk/2.0/demos/__init__.pyc
@@ -90,10 +88,6 @@ lib/pygtk/2.0/pygtk-demo.py
 lib/pygtk/2.0/pygtk-demo.pyc
 lib/pygtk/2.0/pygtk-demo.pyo
 ${PYSITELIB}/gtk-2.0/atk.la
-${PYSITELIB}/gtk-2.0/dsextras.py
-${PYSITELIB}/gtk-2.0/dsextras.pyc
-${PYSITELIB}/gtk-2.0/dsextras.pyo
-${PYSITELIB}/gtk-2.0/gobject.la
 ${PYSITELIB}/gtk-2.0/gtk/__init__.py
 ${PYSITELIB}/gtk-2.0/gtk/__init__.pyc
 ${PYSITELIB}/gtk-2.0/gtk/__init__.pyo
@@ -106,10 +100,6 @@ ${PYSITELIB}/gtk-2.0/gtk/keysyms.py
 ${PYSITELIB}/gtk-2.0/gtk/keysyms.pyc
 ${PYSITELIB}/gtk-2.0/gtk/keysyms.pyo
 ${PYSITELIB}/gtk-2.0/pango.la
-${PYSITELIB}/pygtk.pth
-${PYSITELIB}/pygtk.py
-${PYSITELIB}/pygtk.pyc
-${PYSITELIB}/pygtk.pyo
 share/pygtk/2.0/codegen/__init__.py
 share/pygtk/2.0/codegen/__init__.pyc
 share/pygtk/2.0/codegen/__init__.pyo
@@ -164,10 +154,8 @@ share/pygtk/2.0/defs/pango.defs
 @dirrm share/pygtk/2.0
 @dirrm share/pygtk
 @dirrm ${PYSITELIB}/gtk-2.0/gtk
-@dirrm ${PYSITELIB}/gtk-2.0
 @dirrm lib/pygtk/2.0/demos/images
 @dirrm lib/pygtk/2.0/demos
 @dirrm lib/pygtk/2.0
 @dirrm lib/pygtk
 @dirrm include/pygtk-2.0/pygtk
-@dirrm include/pygtk-2.0
diff --git a/x11/py-gtk2/buildlink3.mk b/x11/py-gtk2/buildlink3.mk
index a5e8097d4e5..665e5df149e 100644
--- a/x11/py-gtk2/buildlink3.mk
+++ b/x11/py-gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/02/05 23:11:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/02/07 21:27:28 drochner Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_GTK2_BUILDLINK3_MK:=	${PY_GTK2_BUILDLINK3_MK}+
@@ -13,11 +13,11 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npygtk2}
 BUILDLINK_PACKAGES+=	pygtk2
 
 .if !empty(PY_GTK2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.4.0
-BUILDLINK_RECOMMENDED.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.2nb2
+BUILDLINK_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.8.4
 BUILDLINK_PKGSRCDIR.pygtk2?=	../../x11/py-gtk2
 .endif	# PY_GTK2_BUILDLINK3_MK
 
+.include "../../devel/py-gobject/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/py-gtk2/distinfo b/x11/py-gtk2/distinfo
index b63cb77f216..d542ca7d2b0 100644
--- a/x11/py-gtk2/distinfo
+++ b/x11/py-gtk2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2005/10/18 18:04:24 drochner Exp $
+$NetBSD: distinfo,v 1.11 2006/02/07 21:27:28 drochner Exp $
 
-SHA1 (pygtk-2.8.2.tar.bz2) = de065df2a2bd4ca583e60928b6e9069dc35dc276
-RMD160 (pygtk-2.8.2.tar.bz2) = 5e3e2546e252afb885196da5ae828d52b543df8f
-Size (pygtk-2.8.2.tar.bz2) = 748763 bytes
+SHA1 (pygtk-2.8.4.tar.bz2) = 0fe7c60da5b5bd4dd29a04a25311d72917585f95
+RMD160 (pygtk-2.8.4.tar.bz2) = 358bdd0461792bd80651d434984d24bc206a6b30
+Size (pygtk-2.8.4.tar.bz2) = 753497 bytes