Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

3 files changed, 6 insertions, 683 deletions

diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 7e8bcd2b38b8..70a40e7e7321 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -3,17 +3,16 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.48 2009/04/07 03:08:53 marcus Exp $
+#   $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.55 2009/11/28 05:59:04 mezz Exp $
 #
 
-PORTNAME=	gnome
+PORTNAME=	gnome-extras
 PORTVERSION=	2.25.3
-PORTREVISION=	4
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-extras
 DISTNAME=	gnome-python-extras-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,8 +21,8 @@ COMMENT=	A set of Python bindings for GNOME 2
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell \
 		gksu1.2.0:${PORTSDIR}/sysutils/libgksu \
-		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui \
-		gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
+		gksuui1.0.1:${PORTSDIR}/sysutils/libgksuui
+#		gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
 
 USE_GECKO=	libxul
 USE_BZIP2=	yes
@@ -33,6 +32,7 @@ USE_GNOME=	gnomehack libgtkhtml pygnome2 libgda4
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--disable-gdl
 
 EG_SRC_DIR=	${WRKSRC}/examples
 EG_DST_DIR=	${PREFIX}/share/examples/py-gnome
diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure
deleted file mode 100644
index 04f5b256944c..000000000000
--- a/x11-toolkits/py-gnome-extras/files/patch-configure
+++ /dev/null
@@ -1,675 +0,0 @@
---- configure.orig	2009-02-28 16:14:05.000000000 -0500
-+++ configure	2009-02-28 16:21:48.000000000 -0500
-@@ -1721,7 +1721,7 @@ Optional Packages:
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
-   --with-tags[=TAGS]      include additional configurations [automatic]
--  --with-gtkmozembed=mozilla|firefox|xulrunner
-+  --with-gtkmozembed=mozilla|firefox|xulrunner|seamonkey
-                           package that provides libgtkmozembed
- 
- Some influential environment variables:
-@@ -22428,6 +22428,150 @@ fi
- 
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+                build_gtkmozembed=false
-+elif test $pkg_failed = untried; then
-+	build_gtkmozembed=false
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 build_gtkmozembed=false
- elif test $pkg_failed = untried; then
- 	build_gtkmozembed=false
-@@ -22436,6 +22580,14 @@ else
- 	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	build_gtkmozembed=true; mozpackage=mozilla
- fi
- 
-@@ -22506,6 +22658,150 @@ fi
- 
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+                build_gtkmozembed=false
-+elif test $pkg_failed = untried; then
-+	build_gtkmozembed=false
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 build_gtkmozembed=false
- elif test $pkg_failed = untried; then
- 	build_gtkmozembed=false
-@@ -22514,6 +22810,14 @@ else
- 	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	build_gtkmozembed=true; mozpackage=mozilla
- fi
- 
-@@ -22658,6 +22962,150 @@ fi
- 
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+                build_gtkmozembed=false
-+elif test $pkg_failed = untried; then
-+	build_gtkmozembed=false
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 build_gtkmozembed=false
- elif test $pkg_failed = untried; then
- 	build_gtkmozembed=false
-@@ -22666,6 +23114,14 @@ else
- 	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	build_gtkmozembed=true; mozpackage=mozilla
- fi
- 
-@@ -22736,6 +23192,150 @@ fi
- 
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+                build_gtkmozembed=false
-+elif test $pkg_failed = untried; then
-+	build_gtkmozembed=false
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+elif test $pkg_failed = untried; then
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5
-+$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-+
-+if test -n "$GTKMOZEMBED_CFLAGS"; then
-+    pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+if test -n "$GTKMOZEMBED_LIBS"; then
-+    pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+    if test -n "$PKG_CONFIG" && \
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; then
-+  pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>/dev/null`
-+else
-+  pkg_failed=yes
-+fi
-+ else
-+    pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+        _pkg_short_errors_supported=yes
-+else
-+        _pkg_short_errors_supported=no
-+fi
-+        if test $_pkg_short_errors_supported = yes; then
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        else
-+	        GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3
-+				gtk+-2.0	>= 2.4.0" 2>&1`
-+        fi
-+	# Put the nasty error message in config.log where it belongs
-+	echo "$GTKMOZEMBED_PKG_ERRORS" >&5
-+
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                 build_gtkmozembed=false
- elif test $pkg_failed = untried; then
- 	build_gtkmozembed=false
-@@ -22744,6 +23344,14 @@ else
- 	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-         { $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
-+	build_gtkmozembed=true; mozpackage=seamonkey
-+fi
-+
-+else
-+	GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
-+	GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 	build_gtkmozembed=true; mozpackage=mozilla
- fi
- 
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index 8564adea3250..fb6368087b33 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -8,8 +8,6 @@ include/pygda-4.0/pygdavalue_conversions.h
 %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gdl.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu/__init__.pyo