[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/, app-editors/gedit/files/

[Nirbheek Chauhan]

commit:     e0602fdc648a4ec652df26ddeeeac44f6c700f90
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 12:11:57 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 12:11:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e0602fdc

app-editors/gedit: 2.91.6 -> 2.91.7

---
 app-editors/gedit/files/gedit-libpeas-compat.patch |   49 --------------------
 ...{gedit-2.91.6-r1.ebuild => gedit-2.91.7.ebuild} |   10 ++--
 app-editors/gedit/gedit-9999.ebuild                |   10 ++--
 3 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/app-editors/gedit/files/gedit-libpeas-compat.patch b/app-editors/gedit/files/gedit-libpeas-compat.patch
deleted file mode 100644
index 755859c..0000000
--- a/app-editors/gedit/files/gedit-libpeas-compat.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9201fe7bfe6ab36830cb0660be449b0a90d6c55e Mon Sep 17 00:00:00 2001
-From: Garrett Regier <alias301@×××××.com>
-Date: Mon, 14 Feb 2011 13:23:11 +0000
-Subject: Update to latest libpeas API changes
-
----
-diff --git a/configure.ac b/configure.ac
-index e7d6563..9e42175 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -307,8 +307,8 @@ PKG_CHECK_MODULES(GEDIT, [
- 	gio-2.0 >= 2.25.11
- 	gtk+-3.0 >= 2.99.0
- 	gtksourceview-3.0 >= 2.91.1
--	libpeas-1.0 >= 0.7.0
--	libpeas-gtk-1.0 >= 0.7.0
-+	libpeas-1.0 >= 0.7.2
-+	libpeas-gtk-1.0 >= 0.7.2
- 	gsettings-desktop-schemas
- ])
- 
-diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/gedit-preferences-dialog.c
-index 816f73d..ec1e3f7 100644
---- a/gedit/dialogs/gedit-preferences-dialog.c
-+++ b/gedit/dialogs/gedit-preferences-dialog.c
-@@ -904,7 +904,7 @@ setup_plugins_page (GeditPreferencesDialog *dlg)
- 
- 	gedit_debug (DEBUG_PREFS);
- 
--	page_content = peas_gtk_plugin_manager_new ();
-+	page_content = peas_gtk_plugin_manager_new (NULL);
- 	g_return_if_fail (page_content != NULL);
- 
- 	gtk_box_pack_start (GTK_BOX (dlg->priv->plugin_manager_place_holder),
-diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
-index 807bbc2..93596f4 100644
---- a/gedit/gedit-plugins-engine.c
-+++ b/gedit/gedit-plugins-engine.c
-@@ -66,6 +66,8 @@ gedit_plugins_engine_init (GeditPluginsEngine *engine)
- 	                                            GEDIT_TYPE_PLUGINS_ENGINE,
- 	                                            GeditPluginsEnginePrivate);
- 
-+  peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
-+
- 	engine->priv->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");
- 	
- 	/* Require gedit's typelib. */
---
-cgit v0.8.3.4

diff --git a/app-editors/gedit/gedit-2.91.6-r1.ebuild b/app-editors/gedit/gedit-2.91.7.ebuild
similarity index 93%
rename from app-editors/gedit/gedit-2.91.6-r1.ebuild
rename to app-editors/gedit/gedit-2.91.7.ebuild
index 80c4ee5..522d324 100644
--- a/app-editors/gedit/gedit-2.91.6-r1.ebuild
+++ b/app-editors/gedit/gedit-2.91.7.ebuild
@@ -27,8 +27,8 @@ fi
 # X libs are not needed for OSX (aqua)
 RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.27.92
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+	>=dev-libs/glib-2.26
+	>=x11-libs/gtk+-3.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
 	>=dev-libs/libpeas-0.7.2[gtk]
 
@@ -58,7 +58,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
 pkg_setup() {
+	# TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?)
 	G2CONF="${G2CONF}
+		--disable-indicator
 		--disable-deprecations
 		--disable-maintainer-mode
 		--disable-schemas-compile
@@ -78,7 +80,3 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
 }
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
-}

diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild
index 80c4ee5..522d324 100644
--- a/app-editors/gedit/gedit-9999.ebuild
+++ b/app-editors/gedit/gedit-9999.ebuild
@@ -27,8 +27,8 @@ fi
 # X libs are not needed for OSX (aqua)
 RDEPEND=">=x11-libs/libSM-1.0
 	>=dev-libs/libxml2-2.5.0
-	>=dev-libs/glib-2.27.92
-	>=x11-libs/gtk+-2.99.0:3[introspection?]
+	>=dev-libs/glib-2.26
+	>=x11-libs/gtk+-3.0:3[introspection?]
 	>=x11-libs/gtksourceview-2.91.1:3.0[introspection?]
 	>=dev-libs/libpeas-0.7.2[gtk]
 
@@ -58,7 +58,9 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
 pkg_setup() {
+	# TODO: Zeitgeist support, if GNOME 3 adds it to moduleset (3.2?)
 	G2CONF="${G2CONF}
+		--disable-indicator
 		--disable-deprecations
 		--disable-maintainer-mode
 		--disable-schemas-compile
@@ -78,7 +80,3 @@ pkg_postrm() {
 	gnome2_pkg_postrm
 	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
 }
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
-}