add ebuilds

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2464 6952d904-891a-0410-993b-d76249ca496b
2010-10-04 19:24:16 +00:00
parent 53d472c69f
commit 677e030bbd
69 changed files with 3569 additions and 0 deletions
--- a/dev-python/gtkmozembed-python/ChangeLog
+++ b/dev-python/gtkmozembed-python/ChangeLog
@@ -0,0 +1,134 @@
+# ChangeLog for dev-python/gtkmozembed-python
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/ChangeLog,v 1.28 2010/08/01 10:35:44 fauli Exp $
+
+  01 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
+  gtkmozembed-python-2.25.3.ebuild:
+  x86 stable, bug 324077
+
+  31 Jul 2010; Pacho Ramos <pacho@gentoo.org>
+  gtkmozembed-python-2.25.3.ebuild:
+  amd64 stable, bug 324077
+
+  16 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  gtkmozembed-python-2.19.1-r12.ebuild:
+  ppc64 stable wrt #305287
+
+  11 Jul 2010; Pacho Ramos <pacho@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Drop hppa keyword per bug #324511.
+
+*gtkmozembed-python-2.25.3 (14 Jun 2010)
+
+  14 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +gtkmozembed-python-2.25.3.ebuild,
+  +files/gtkmozembed-python-2.25.3-xulrunner19.patch:
+  Version bump with lots of bugfixes over current stable.
+
+  02 Jun 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild,
+  gtkmozembed-python-2.19.1-r12.ebuild:
+  Update to use EAPI=2 due to eclass changes.
+
+  11 Apr 2010; <nixnut@gentoo.org> gtkmozembed-python-2.19.1-r12.ebuild:
+  ppc stable #305287
+
+  22 Mar 2010; Pacho Ramos <pacho@gentoo.org>
+  -gtkmozembed-python-2.19.1.ebuild:
+  Remove old gtkmozembed-python since it's no longer required by any package
+  on ~x86-fbsd, this also solves bug 300439
+
+  07 Mar 2010; Raúl Porcel <armin76@gentoo.org>
+  gtkmozembed-python-2.19.1-r12.ebuild:
+  alpha/ia64/sparc stable wrt #305287
+
+  07 Mar 2010; Pacho Ramos <pacho@gentoo.org>
+  gtkmozembed-python-2.19.1-r12.ebuild:
+  amd64 stable, bug 305287
+
+  24 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
+  gtkmozembed-python-2.19.1-r12.ebuild:
+  stable x86, bug 305287
+
+  26 Dec 2009; Raúl Porcel <armin76@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  sparc stable wrt #258040
+
+*gtkmozembed-python-2.19.1-r12 (24 Dec 2009)
+
+  24 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +gtkmozembed-python-2.19.1-r12.ebuild,
+  +files/gtkmozembed-python-2.19.1-include-nspr.patch:
+  Add nspr includes, fixes bug 296924
+
+  25 Aug 2009; Alexis Ballier <aballier@gentoo.org>
+  gtkmozembed-python-2.19.1.ebuild:
+  keyword ~x86-fbsd
+
+  24 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gtkmozembed-python-2.19.1.ebuild, -gtkmozembed-python-2.19.1-r10.ebuild:
+  Clean up old revisions per bug #282294.
+
+  10 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Re-add ~sparc keyword, bug #253541
+
+  23 Mar 2009; Jeroen Roovers <jer@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Stable for HPPA (bug #258040).
+
+  17 Mar 2009; Raúl Porcel <armin76@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  ia64/sparc stable wrt #258040
+
+  08 Mar 2009; Markus Meier <maekke@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  amd64/x86 stable, bug #258040
+
+  05 Mar 2009; Brent Baude <ranger@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Marking gtkmozembed-python-2.19.1-r11 ppc stable for bug 258040
+
+  03 Mar 2009; Brent Baude <ranger@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Marking gtkmozembed-python-2.19.1-r11 ppc64 stable for bug 258040
+
+  14 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Stable on alpha, bug #258040
+
+  06 Jan 2009; Jesus Rivero <neurogeek@gentoo.org>
+  gtkmozembed-python-2.19.1.ebuild, gtkmozembed-python-2.19.1-r10.ebuild,
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Updated DESCRIPTION var
+
+  04 Jan 2009; Raúl Porcel <armin76@gentoo.org>
+  gtkmozembed-python-2.19.1-r10.ebuild,
+  gtkmozembed-python-2.19.1-r11.ebuild:
+  Mark -sparc the revisions that use xulrunner-1.9, bug #253541
+
+*gtkmozembed-python-2.19.1-r11 (14 Dec 2008)
+
+  14 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gtkmozembed-python-2.19.1-libtool2.patch,
+  +files/gtkmozembed-python-2.19.1-xulrunner19.patch,
+  +gtkmozembed-python-2.19.1-r11.ebuild:
+  Actually build and install against xulrunner 1.9, close bug #249470.
+
+  19 Nov 2008; Daniel Gryniewicz <dang@gentoo.org>
+  gtkmozembed-python-2.19.1-r10.ebuild:
+  Fix configure option that I borked
+
+*gtkmozembed-python-2.19.1-r10 (19 Nov 2008)
+
+  19 Nov 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +gtkmozembed-python-2.19.1-r10.ebuild:
+  Add a version depending on xulrunner 1.9
+
+*gtkmozembed-python-2.19.1 (16 Oct 2008)
+
+  16 Oct 2008; Gilles Dartiguelongue <eva@gentoo.org> +metadata.xml,
+  +gtkmozembed-python-2.19.1.ebuild:
+  Initial import of gnome-python-extras split ebuilds. This package installs
+  bindings for the gtkmozembed library.
+
--- a/dev-python/gtkmozembed-python/Manifest
+++ b/dev-python/gtkmozembed-python/Manifest
@@ -0,0 +1,8 @@
+AUX gtkmozembed-python-2.19.1-include-nspr.patch 1229 RMD160 0f61cc8cf238367eb9b0f9d73ba8b5a0b6ee6ba2 SHA1 198f4f15fa1f0fcff0c03cdea126299b21da1752 SHA256 faabdfefebc986ad88455ccd0b1a5e169bd5c2c88f60194ed59ee56fe30e4baa
+AUX gtkmozembed-python-2.19.1-libtool2.patch 258 RMD160 fde8da7619505c900a4e6bda65c53ed513ede654 SHA1 4572d47c6249fa9625ff9ed9bd1fee03ccb94f92 SHA256 4fc38245da2ce74f6c89d78230dda5aadd8dd1fc1c20756d58ffd4b448bb1259
+AUX gtkmozembed-python-2.19.1-xulrunner19.patch 7617 RMD160 abc760201ea7039f98fd6e2d45433580c314e66b SHA1 f777b30b1fbb0aece97e31f096fec3dc3f798e53 SHA256 45ce580e62b0c541adc1ff85c3359c22282a1ecaf2bb24187ce3de664ae6ad45
+AUX gtkmozembed-python-2.25.3-xulrunner19.patch 8842 RMD160 3c069ada7bd2a87fe43a4ff5974ba37cc3794d88 SHA1 8773f776b93b08cfe8a988c981c99398d4c18443 SHA256 07da62cd2e6aa3a44249df3f74cc455c4943af17683d615f7808398f6625039f
+DIST gnome-python-extras-2.25.3.tar.bz2 370489 RMD160 e09bc0152512e2caa61626a7dc788d7336f24e46 SHA1 e69e5288466c960ed6f985bb10c9969b21ed85a4 SHA256 ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c
+EBUILD gtkmozembed-python-2.25.3.ebuild 1152 RMD160 27cb7d63088c23ce7fa18577533f0e662cdef6a6 SHA1 7c263d1fe05230235006103fabd1a4bb5b789bca SHA256 48647c0ca567f3eb6e57019fcb7afbbb2c15d017b755d75bb57304ae59e41438
+MISC ChangeLog 4632 RMD160 62bbb7f6db259ead628ddef8e99da09939c9a6f9 SHA1 d95e32eb4e50dd605c2ae25abf9e32241cabc5bb SHA256 11c05dd830e681f5b6c9935b25172a3e869e38adffcdd1bdd19efe9f1c7bdea8
+MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
--- a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-include-nspr.patch
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-include-nspr.patch
@@ -0,0 +1,39 @@
+Fix building with xulrunner-1.9.2 by including nspr CFLAGS as well
+
+http://bugs.gentoo.org/296924
+
+---
+--- a/gtkmozembed/Makefile.am
+++ b/gtkmozembed/Makefile.am
+@@ -1,7 +1,7 @@
+ # require automake-1.5
+ AUTOMAKE_OPTIONS = 1.5
+ 
+-INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTKMOZEMBED_CFLAGS)
+INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTKMOZEMBED_CFLAGS) $(NSPR_CFLAGS)
+ 
+ defsdir = $(datadir)/pygtk/2.0/defs
+ defs_DATA = gtkmozembed.defs
+--- a/configure.ac
+++ b/configure.ac
+@@ -24,6 +24,7 @@
+ m4_define(gksu_required_version,              1.2.5)
+ m4_define(gksu2_required_version,             2.0.4)
+ m4_define(gksuui_required_version,            1.0.3)
+m4_define(nspr_required_version,	4.7.4)
+ 
+ AC_INIT(gnome-python-extras, gnome_python_extras_version,
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python])
+@@ -62,6 +63,11 @@
+ AM_PATH_PYTHON(2.3)
+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+ 
+dnl check for nspr
+AC_MSG_CHECKING(for system nspr >= nspr_required_version )
+PKG_CHECK_MODULES(NSPR, nspr >= nspr_required_version)
+AC_SUBST(NSPR_CFLAGS)
+
+ dnl check for pygtk
+ PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
+ AC_SUBST(PYGTK_CFLAGS)
+
--- a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-libtool2.patch
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-libtool2.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2008-07-01 14:01:35.000000000 +0200
+++ b/configure.ac	2008-07-01 14:02:08.000000000 +0200
+@@ -43,6 +43,8 @@
+ 
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+AC_PROG_CXX
+m4_ifdef([LT_OUTPUT],[LT_OUTPUT])
+
+ dnl check for python
+ AM_PATH_PYTHON(2.3)
--- a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-xulrunner19.patch
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.19.1-xulrunner19.patch
@@ -0,0 +1,209 @@
+---
+ Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=532856
+ Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=223265
+ Ubuntu: http://patches.ubuntu.com/by-release/extracted/ubuntu/g/gnome-python-extras/2.19.1-0ubuntu13/02_xul19.dpatch
+
+ Ubuntu patch updated to apply on top of our "split gnome-python-extras" patch
+
+diff -Nuar a/configure.ac b/configure.ac
+--- a/configure.ac	2008-12-12 17:15:44.000000000 +0100
+++ b/configure.ac	2008-12-12 17:23:45.000000000 +0100
+@@ -19,6 +19,7 @@
+ m4_define(mozilla_required_version,           1.2b)
+ m4_define(firefox_required_version,           1.0)
+ m4_define(xulrunner_required_version,         1.8)
+m4_define(xulrunner19_required_version,       1.9)
+ m4_define(libgda_required_version,            2.99.6)
+ m4_define(gksu_required_version,              1.2.5)
+ m4_define(gksu2_required_version,             2.0.4)
+@@ -186,46 +187,80 @@
+ dnl should we build the gtkmozembed module?
+ AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
+ AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
+-                         [--with-gtkmozembed=mozilla|firefox|xulrunner],
+                         [--with-gtkmozembed=mozilla|firefox|xulrunner|xulrunner-1.9],
+                          [package that provides libgtkmozembed]),
+             [mozpackage=$withval], [mozpackage=any])
+ 
+ if "$build_gtkmozembed"; then
+ if test $mozpackage = any ; then
+ 
+PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner19_required_version
+				gtk+-2.0         >= gtk_required_version],
+  [build_gtkmozembed=true; mozpackage=xulrunner-1.9; mozpkgconfig=libxul-embedding],
+  [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
+                                 gtk+-2.0              >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=xulrunner],
+  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
+   [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
+                                 gtk+-2.0            >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=firefox],
+  [build_gtkmozembed=true; mozpackage=firefox; mozpkgconfig=$mozpackage-gtkmozembed],
+   [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
+                                 gtk+-2.0            >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=mozilla],
+  [build_gtkmozembed=true; mozpackage=mozilla; mozpkgconfig=$mozpackage-gtkmozembed],
+   build_gtkmozembed=false)
+   ])
+   ])
+  ])
+ 
+ else
+ 
+ case $mozpackage in
+-     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
+-     firefox) mozpackage_required_version=firefox_required_version ;;
+-     mozilla) mozpackage_required_version=mozilla_required_version ;;
+-     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
+	xulrunner-1.9) mozpackage_required_version=xulrunner19_required_version ; mozpkgconfig=libxul-embedding ;;
+	xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+	firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+	mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+	*) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'xulrunner-1.9' or 'xulrunner'])
+ esac
+ 
+-PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
+-                                gtk+-2.0                >= gtk_required_version],
+PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
+                                gtk+-2.0      >= gtk_required_version],
+   build_gtkmozembed=true,
+   build_gtkmozembed=false)
+ 
+ fi # if mozpackage = any
+ 
+if test $mozpackage = xulrunner-1.9; then
+GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding)"
+GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS $(pkg-config --libs libxul-embedding)"
+
+else
+
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+ AC_SUBST(MOZILLA_HOME)
+fi
+
+AC_SUBST(GTKMOZEMBED_CFLAGS)
+AC_SUBST(GTKMOZEMBED_LIBS)
+AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
+
+AC_LANG_PUSH(C++)
+_SAVE_CPPFLAGS=$CPPFLAGS
+_SAVE_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$GTKMOZEMBED_CFLAGS
+CPPFLAGS=
+AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+[[#ifndef XPCOM_GLUE
+#error "no xpcom glue"
+#endif]])],
+[have_xpcom_glue=yes], [have_xpcom_glue=yes]
+)
+CPPFLAGS=$_SAVE_CPPFLAGS
+CXXFLAGS=$_SAVE_CXXFLAGS
+AC_LANG_POP(C++)
+
+AM_CONDITIONAL(HAVE_XPCOM_GLUE, [test $have_xpcom_glue=yes])
+ 
+ fi # if build_gtkmozembed
+ 
+diff -Nuar a/gtkmozembed/gtkmozembedmodule.cpp b/gtkmozembed/gtkmozembedmodule.cpp
+--- a/gtkmozembed/gtkmozembedmodule.cpp	1970-01-01 01:00:00.000000000 +0100
+++ b/gtkmozembed/gtkmozembedmodule.cpp	2008-12-12 17:19:32.000000000 +0100
+@@ -0,0 +1,73 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* include this first, before NO_IMPORT_PYGOBJECT is defined */
+#include <pygobject.h>
+#include <pygtk/pygtk.h>
+
+#ifdef XPCOM_GLUE
+#include "gtkmozembed_glue.cpp"
+#endif
+
+G_BEGIN_DECLS
+void initgtkmozembed(void);
+void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
+void pygtkmozembed_register_classes (PyObject *d);
+G_END_DECLS
+
+extern PyMethodDef pygtkmozembed_functions[];
+
+void
+initgtkmozembed(void)
+{
+    PyObject *m, *d;
+    int argc = 0;
+
+    init_pygobject ();
+
+#ifdef XPCOM_GLUE
+    static const GREVersionRange greVersion = {
+    "1.9b", PR_TRUE,
+    "1.9.*", PR_TRUE
+    };
+    char xpcomLocation[4096];
+    nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
+    if (NS_FAILED(rv)) {
+	printf("failed 1\n");
+	return;
+    } else printf("location: %s \n", xpcomLocation);
+
+    // Startup the XPCOM Glue that links us up with XPCOM.
+    XPCOMGlueStartup(xpcomLocation);
+    if (NS_FAILED(rv)) {
+        printf("failed 2\n");
+        return;
+    }
+    printf("before 3\n");
+
+    rv = GTKEmbedGlueStartup();
+    if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
+        printf("failed 3\n");
+        return;
+    }
+
+    //gtk_moz_embed_set_comp_path(xpcomLocation);
+
+    char *lastSlash = strrchr(xpcomLocation, '/');
+    if (lastSlash)
+      *lastSlash = '\0';
+
+    gtk_moz_embed_set_path(xpcomLocation);
+#endif
+
+    m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
+    d = PyModule_GetDict (m);
+
+    pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
+    pygtkmozembed_register_classes (d);
+
+    if (PyErr_Occurred ()) {
+        Py_FatalError ("can't initialise module gtkmozembed");
+    }
+}
+diff -Nuar a/gtkmozembed/Makefile.am b/gtkmozembed/Makefile.am
+--- a/gtkmozembed/Makefile.am	2008-12-12 17:15:44.000000000 +0100
+++ b/gtkmozembed/Makefile.am	2008-12-12 17:19:32.000000000 +0100
+@@ -13,9 +13,17 @@
+ pkgpyexec_LTLIBRARIES = gtkmozembed.la
+ gtkmozembed_la_LDFLAGS = -module -avoid-version	\
+ 	-export-symbols-regex initgtkmozembed	\
+-	-R$(MOZILLA_HOME)
+	$(NULL)
+
+# only use rpath for non-glue builds
+if HAVE_XPCOM_GLUE
+gtkmozembed_la_LDFLAGS += $(NULL)
+else
+gtkmozembed_la_LDFLAGS += -R$(MOZILLA_HOME)
+endif
+
+ gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
+-gtkmozembed_la_SOURCES = gtkmozembedmodule.c
+gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
+ nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
+ gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
+ CLEANFILES = gtkmozembed.c
--- a/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.25.3-xulrunner19.patch
+++ b/dev-python/gtkmozembed-python/files/gtkmozembed-python-2.25.3-xulrunner19.patch
@@ -0,0 +1,225 @@
+Index: gnome-python-extras-2.25.3/configure.ac
+===================================================================
+--- gnome-python-extras-2.25.3.orig/configure.ac	2009-02-15 23:20:23.000000000 +0100
+++ gnome-python-extras-2.25.3/configure.ac	2009-03-09 17:43:01.417674203 +0100
+@@ -19,6 +19,7 @@ m4_define(gtkhtml2_required_version,    
+ m4_define(mozilla_required_version,           1.2b)
+ m4_define(firefox_required_version,           1.0)
+ m4_define(xulrunner_required_version,         1.8)
+m4_define(xulrunner19_required_version,       1.9)
+ m4_define(libgda_required_version,            3.99.11)
+ m4_define(gksu_required_version,              1.2.5)
+ m4_define(gksu2_required_version,             2.0.4)
+@@ -230,65 +231,88 @@ AM_CONDITIONAL(BUILD_EGG, $build_eggrece
+ dnl should we build the gtkmozembed module?
+ AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
+ AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
+-                         [--with-gtkmozembed=mozilla|firefox|xulrunner],
+                         [--with-gtkmozembed=mozilla|firefox|xulrunner|xulrunner-1.9],
+                          [package that provides libgtkmozembed]),
+             [mozpackage=$withval], [mozpackage=any])
+ 
+ if "$build_gtkmozembed"; then
+ if test $mozpackage = any ; then
+ 
+PKG_CHECK_MODULES(GTKMOZEMBED, [libxul-embedding >= xulrunner19_required_version
+                                gtk+-2.0         >= gtk_required_version],
+  [build_gtkmozembed=true; mozpackage=xulrunner-1.9; mozpkgconfig=libxul-embedding],
+  [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
+                                 gtk+-2.0              >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=xulrunner],
+  [build_gtkmozembed=true; mozpackage=xulrunner; mozpkgconfig=$mozpackage-gtkmozembed],
+   [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
+                                 gtk+-2.0            >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=firefox],
+  [build_gtkmozembed=true; mozpackage=firefox; mozpkgconfig=$mozpackage-gtkmozembed],
+   [
+ PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
+                                 gtk+-2.0            >= gtk_required_version],
+-  [build_gtkmozembed=true; mozpackage=mozilla],
+  [build_gtkmozembed=true; mozpackage=mozilla; mozpkgconfig=$mozpackage-gtkmozembed],
+   build_gtkmozembed=false)
+   ])
+   ])
+  ])
+ 
+ else
+ 
+GTKMOZEMBED_CODEGEN_DEFINES=""
+ case $mozpackage in
+-     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
+-     firefox) mozpackage_required_version=firefox_required_version ;;
+-     mozilla)
+-         mozpackage_required_version=mozilla_required_version
+-         AC_MSG_CHECKING([for extra gtkmozembed code generation flags])
+-         PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21 gtk+-2.0,
+-                           GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19",
+-                           GTKMOZEMBED_CODEGEN_DEFINES="")
+-         AC_MSG_RESULT([$GTKMOZEMBED_CODEGEN_DEFINES])
+-         ;;
+-     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
+     xulrunner-1.9) mozpackage_required_version=xulrunner19_required_version ; mozpkgconfig=libxul-embedding ; GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19" ;;
+     xulrunner) mozpackage_required_version=xulrunner_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+     firefox) mozpackage_required_version=firefox_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+     mozilla) mozpackage_required_version=mozilla_required_version ; mozpkgconfig=$mozpackage-gtkmozembed ;;
+     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', 'xulrunner-1.9' or 'xulrunner'])
+ esac
+ AC_SUBST(GTKMOZEMBED_CODEGEN_DEFINES)
+ 
+-PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
+-                                gtk+-2.0                >= gtk_required_version],
+PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpkgconfig >= $mozpackage_required_version,
+                                gtk+-2.0      >= gtk_required_version],
+   build_gtkmozembed=true,
+   build_gtkmozembed=false)
+ 
+ fi
+ 
+ AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
+-if test -n "$export_dynamic"; then
+-  GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
+-fi
+-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+-if test -z "$MOZILLA_HOME"; then
+-   MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
+-fi
+-AC_SUBST(MOZILLA_HOME)
+if test $mozpackage = xulrunner-1.9; then
+  GTKMOZEMBED_CFLAGS="$(pkg-config --cflags --define-variable=includetype=unstable libxul-embedding gtk+-2.0)"
+else
+  MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
+  if test -z "$MOZILLA_HOME"; then
+     MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
+  fi
+  AC_SUBST(MOZILLA_HOME)
+fi # $mozpackage = xulrunner-1.9
+ 
+ fi # if build_gtkmozembed
+ 
+ AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
+
+AC_LANG_PUSH(C++)
+_SAVE_CPPFLAGS=$CPPFLAGS
+_SAVE_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$GTKMOZEMBED_CFLAGS
+CPPFLAGS=
+AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+[[#ifndef XPCOM_GLUE
+#error "no xpcom glue"
+#endif]])],
+[have_xpcom_glue=yes], [have_xpcom_glue=yes]
+)
+CPPFLAGS=$_SAVE_CPPFLAGS
+CXXFLAGS=$_SAVE_CXXFLAGS
+AC_LANG_POP(C++)
+
+AM_CONDITIONAL(HAVE_XPCOM_GLUE, [test $have_xpcom_glue=yes])
+if test "$have_xpcom_glue" = "yes"; then
+  AC_DEFINE(HAVE_XPCOM_GLUE, 1,
+    [Define to 1 if libxpcomglue is being used.])
+fi
+
+ if test -n "$export_dynamic"; then
+   GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
+ fi
+Index: gnome-python-extras-2.25.3/gtkmozembed/Makefile.am
+===================================================================
+--- gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.am	2008-12-12 02:06:29.000000000 +0100
+++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.am	2009-03-09 17:11:56.390812130 +0100
+@@ -13,9 +13,15 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0
+ pkgpyexec_LTLIBRARIES = gtkmozembed.la
+ gtkmozembed_la_LDFLAGS = -module -avoid-version	\
+ 	-export-symbols-regex initgtkmozembed	\
+-	-R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
+	$(NULL)
+
+# only use rpath for non-glue builds
+if !HAVE_XPCOM_GLUE
+       gtkmozembed_la_LDFLAGS + = -R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
+endif
+
+ gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
+-gtkmozembed_la_SOURCES = gtkmozembedmodule.c
+gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
+ nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
+ gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
+ CLEANFILES = gtkmozembed.c
+Index: gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.cpp	2009-03-09 16:47:51.857680474 +0100
+@@ -0,0 +1,72 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* include this first, before NO_IMPORT_PYGOBJECT is defined */
+#include <pygobject.h>
+#include <pygtk/pygtk.h>
+
+#ifdef XPCOM_GLUE
+#include "gtkmozembed_glue.cpp"
+#endif
+
+G_BEGIN_DECLS
+void initgtkmozembed(void);
+void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
+void pygtkmozembed_register_classes (PyObject *d);
+G_END_DECLS
+
+extern PyMethodDef pygtkmozembed_functions[];
+
+void
+initgtkmozembed(void)
+{
+    PyObject *m, *d;
+    int argc = 0;
+
+    init_pygobject ();
+
+#ifdef XPCOM_GLUE
+    static const GREVersionRange greVersion = {
+    "1.9b", PR_TRUE,
+    "1.9.*", PR_TRUE
+    };
+    char xpcomLocation[4096];
+    nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096);
+    if (NS_FAILED(rv)) {
+	printf("GRE_GetGREPathWithProperties failed\n");
+	return;
+    }
+
+    // Startup the XPCOM Glue that links us up with XPCOM.
+    XPCOMGlueStartup(xpcomLocation);
+    if (NS_FAILED(rv)) {
+        printf("XPCOMGlueStartup failed\n");
+        return;
+    }
+
+    rv = GTKEmbedGlueStartup();
+    if (NS_FAILED(rv)) {printf("location: %s \n", xpcomLocation);
+        printf("GTKEmbedGlueStartup failed\n");
+        return;
+    }
+
+    //gtk_moz_embed_set_comp_path(xpcomLocation);
+
+    char *lastSlash = strrchr(xpcomLocation, '/');
+    if (lastSlash)
+      *lastSlash = '\0';
+
+    gtk_moz_embed_set_path(xpcomLocation);
+#endif
+
+    m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
+    d = PyModule_GetDict (m);
+
+    pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
+    pygtkmozembed_register_classes (d);
+
+    if (PyErr_Occurred ()) {
+        Py_FatalError ("can't initialise module gtkmozembed");
+    }
+}
--- a/dev-python/gtkmozembed-python/gtkmozembed-python-2.25.3.ebuild
+++ b/dev-python/gtkmozembed-python/gtkmozembed-python-2.25.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gtkmozembed-python/gtkmozembed-python-2.25.3.ebuild,v 1.3 2010/08/01 10:35:44 fauli Exp $
+
+EAPI="2"
+G_PY_PN="gnome-python-extras"
+
+inherit confutils gnome-python-common
+
+PVP="$(get_version_component_range 1-2)"
+SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2"
+
+DESCRIPTION="Python bindings for the GtkMozEmbed Gecko library"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="doc"
+
+RDEPEND=">=net-libs/xulrunner-1.9"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	gnome-python-common_pkg_setup
+
+	G2CONF="${G2CONF} --with-gtkmozembed=xulrunner-1.9"
+}
+
+src_prepare() {
+	# Accomodate new releases of libtool
+	epatch "${FILESDIR}/${PN}-2.19.1-libtool2.patch"
+
+	# Allow building with xulrunner 1.9, bug #
+	rm "${S}/gtkmozembed/gtkmozembedmodule.c"
+	epatch "${FILESDIR}/${P}-xulrunner19.patch"
+
+	# Fix building with xulrunner-1.9.2, bug 296924
+	epatch "${FILESDIR}/${PN}-2.19.1-include-nspr.patch"
+
+	eautoreconf
+	gnome-python-common_src_prepare
+}
--- a/dev-python/gtkmozembed-python/metadata.xml
+++ b/dev-python/gtkmozembed-python/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<herd>python</herd>
+</pkgmetadata>