Update to 2.24.1, add two dependencies for more features (it already

depended on most of the kitchen sink anyway...).

Changes:
* configure.ac, wscript: Version 2.24.1.
* configure.ac: libtool-2.2 compatibility, patch by "Cygwin Ports
maintainer" (bug #564550).

* gnomeapplet/applet.override:
* gnomeapplet/appletmodule.c:
* gnomeapplet/wscript:
Fix build error with missing libgnome/libgnomeui flags.
Patch from Lucas Rocha closes bgo #564525

* tests/common.py: Fix a bug in the import check.

3 files changed, 28 insertions, 28 deletions

diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 337135a712c..116a2f5a322 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2008/11/18 12:46:52 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2009/01/07 14:35:12 wiz Exp $
 #
 
-DISTNAME=	gnome-python-desktop-2.24.0
+DISTNAME=	gnome-python-desktop-2.24.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.24/}
@@ -22,31 +22,26 @@ DEPENDS+=	bug-buddy>=2.16:../../net/bug-buddy
 
 PKGCONFIG_OVERRIDE+=	gnome-python-desktop-2.0.pc.in
 
-PYTHON_VERSIONS_ACCEPTED=	24 25
+PYTHON_VERSIONS_ACCEPTED=	25 24
 
-# XXX not yet, needs hal
-PLIST_VARS+=	nautilusburn
-#.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
-
-CONFIGURE_ARGS+=	--disable-evolution
-CONFIGURE_ARGS+=	--disable-evolution_ecal
-
-.include "../../graphics/py-cairo/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/py-cairo/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-.include "../../x11/gnome-panel/buildlink3.mk"
-.include "../../security/gnome-keyring/buildlink3.mk"
-.include "../../x11/gtksourceview/buildlink3.mk"
-.include "../../devel/libwnck/buildlink3.mk"
-.include "../../sysutils/libgtop/buildlink3.mk"
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../x11/py-gnome2/buildlink3.mk"
+.include "../../multimedia/totem-pl-parser/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
+.include "../../sysutils/libgtop/buildlink3.mk"
+.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 # disabled in configure script by default
 # CONFIGURE_ARGS+=	--enable-metacity
 #.include "../../wm/metacity/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../multimedia/totem-pl-parser/buildlink3.mk"
+.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gnome-panel/buildlink3.mk"
+.include "../../x11/gtksourceview/buildlink3.mk"
+.include "../../x11/py-gnome2/buildlink3.mk"
+.include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-gnome2-desktop/PLIST b/x11/py-gnome2-desktop/PLIST
index 8739be1b502..0189fe59fd1 100644
--- a/x11/py-gnome2-desktop/PLIST
+++ b/x11/py-gnome2-desktop/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/15 18:02:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/01/07 14:35:12 wiz Exp $
 lib/pkgconfig/gnome-python-desktop-2.0.pc
 ${PYSITELIB}/gtk-2.0/bugbuddy.py
 ${PYSITELIB}/gtk-2.0/bugbuddy.pyc
 ${PYSITELIB}/gtk-2.0/bugbuddy.pyo
+${PYSITELIB}/gtk-2.0/evolution/__init__.py
+${PYSITELIB}/gtk-2.0/evolution/ebook.la
+${PYSITELIB}/gtk-2.0/evolution/ecal.la
 ${PYSITELIB}/gtk-2.0/gnome/applet.py
 ${PYSITELIB}/gtk-2.0/gnome/applet.pyc
 ${PYSITELIB}/gtk-2.0/gnome/applet.pyo
@@ -20,7 +23,7 @@ ${PYSITELIB}/gtk-2.0/gnomeprint/ui.la
 ${PYSITELIB}/gtk-2.0/gtksourceview.la
 ${PYSITELIB}/gtk-2.0/gtop.la
 ${PYSITELIB}/gtk-2.0/mediaprofiles.la
-${PLIST.nautilusburn}${PYSITELIB}/gtk-2.0/nautilusburn.la
+${PYSITELIB}/gtk-2.0/nautilusburn.la
 ${PYSITELIB}/gtk-2.0/rsvg.la
 ${PYSITELIB}/gtk-2.0/totem/__init__.py
 ${PYSITELIB}/gtk-2.0/totem/__init__.pyc
@@ -65,10 +68,11 @@ share/gtk-doc/html/pygtksourceview/pygtksourceview.devhelp
 share/pygtk/2.0/defs/_gnomedesktop.defs
 share/pygtk/2.0/defs/applet.defs
 share/pygtk/2.0/defs/art.defs
+share/pygtk/2.0/defs/ebook.defs
 share/pygtk/2.0/defs/gnomekeyring.defs
 share/pygtk/2.0/defs/gtksourceview.defs
 share/pygtk/2.0/defs/mediaprofiles.defs
-${PLIST.nautilusburn}share/pygtk/2.0/defs/nautilus_burn.defs
+share/pygtk/2.0/defs/nautilus_burn.defs
 share/pygtk/2.0/defs/print.defs
 share/pygtk/2.0/defs/printui.defs
 share/pygtk/2.0/defs/wnck.defs
@@ -78,3 +82,4 @@ share/pygtk/2.0/defs/wnck.defs
 @dirrm ${PYSITELIB}/gtk-2.0/totem
 @dirrm ${PYSITELIB}/gtk-2.0/gnomeprint
 @dirrm ${PYSITELIB}/gtk-2.0/gnomedesktop
+@dirrm ${PYSITELIB}/gtk-2.0/evolution
diff --git a/x11/py-gnome2-desktop/distinfo b/x11/py-gnome2-desktop/distinfo
index dcc967fe7ab..f10091d8b06 100644
--- a/x11/py-gnome2-desktop/distinfo
+++ b/x11/py-gnome2-desktop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/10/16 18:01:38 drochner Exp $
+$NetBSD: distinfo,v 1.7 2009/01/07 14:35:12 wiz Exp $
 
-SHA1 (gnome-python-desktop-2.24.0.tar.bz2) = a47f2c87c2bde724d46a6464f8ccbcbeb7743ef5
-RMD160 (gnome-python-desktop-2.24.0.tar.bz2) = 6bd7b8afff1fe0857ec5c5e63713e7c881f0a4df
-Size (gnome-python-desktop-2.24.0.tar.bz2) = 620957 bytes
+SHA1 (gnome-python-desktop-2.24.1.tar.bz2) = 97b04ca811670d6cfa208074c1644cee7486ade3
+RMD160 (gnome-python-desktop-2.24.1.tar.bz2) = eeb0f0416e228b889a6ce4cfa3c28c5dd1f77876
+Size (gnome-python-desktop-2.24.1.tar.bz2) = 621325 bytes
 SHA1 (patch-aa) = c59eb57073649f8914c01be6e39c6f71f726766c