media-gfx/eog: Update for latest libpeas API changes

4 files changed, 64 insertions, 5 deletions

diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index b5105f9b..3a286d70 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,4 @@
+AUX eog-libpeas-compat.patch 2111 RMD160 9e44cc7dd5e8eacf16852ea6e2533f39a438871b SHA1 3e95a5c57530d8aa2b64a84db4d264e52dd5e84a SHA256 ec892d396e438047d23ae0c2c39a5e6de1133804d8d845d3ce191b35f2607766
 DIST eog-2.91.7.tar.bz2 3003335 RMD160 df1e5bf8eecfa89fcfa5414c343cad54dae6f278 SHA1 3203e88c573d7e042992be73ed5be493f4df057a SHA256 a79ba796dbcea2a163a9939d4d9c6ced8c3a3b23b2fbdc7f7f4664065c4a7193
-EBUILD eog-2.91.7.ebuild 1674 RMD160 0dc31bd34360ca6684f83c739dd659c1fd03215f SHA1 12b4e600bb66698243eab2bae8d6ead58b334169 SHA256 d8be532de0ea846a71ae08d57e4e5d1d732678aa8e787b4a4c91bb4cf78b4898
-EBUILD eog-9999.ebuild 1674 RMD160 0dc31bd34360ca6684f83c739dd659c1fd03215f SHA1 12b4e600bb66698243eab2bae8d6ead58b334169 SHA256 d8be532de0ea846a71ae08d57e4e5d1d732678aa8e787b4a4c91bb4cf78b4898
+EBUILD eog-2.91.7-r1.ebuild 1749 RMD160 3495b542afc78f8b11761d284e35a066891ef9f9 SHA1 2fdf41216625eb65bcd9337c918e1bbb6be839bf SHA256 b5b999bb85875bfa06ee6ae266b6d24dc19be6cde6bb3d09893bf47f95763951
+EBUILD eog-9999.ebuild 1674 RMD160 65a2aafb3859d329e3c91a48b7ce73b4b3b7da52 SHA1 c4353b84cd7a71d381c5979f0e79c3a480667ac1 SHA256 901e97f40f14ab3dcb8b56f4af3c830144e4c9465a8418febb12e5cf3ca6b154
diff --git a/media-gfx/eog/eog-2.91.7.ebuild b/media-gfx/eog/eog-2.91.7-r1.ebuild
index a9e1e05a..e946f0dd 100644
--- a/media-gfx/eog/eog-2.91.7.ebuild
+++ b/media-gfx/eog/eog-2.91.7-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="The Eye of GNOME image viewer"
 HOMEPAGE="http://www.gnome.org/projects/eog/"
@@ -24,7 +24,7 @@ fi
 RDEPEND=">=x11-libs/gtk+-2.91.7:3[introspection?,jpeg?,tiff?]
 	>=dev-libs/glib-2.25.15
 	>=dev-libs/libxml2-2
-	>=dev-libs/libpeas-0.7.0[gtk]
+	>=dev-libs/libpeas-0.7.2[gtk]
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	>=x11-themes/gnome-icon-theme-2.19.1
@@ -61,3 +61,7 @@ pkg_setup() {
 		--disable-schemas-compile"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-libpeas-compat.patch"
+}
diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild
index a9e1e05a..e622082f 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.ebuild
@@ -24,7 +24,7 @@ fi
 RDEPEND=">=x11-libs/gtk+-2.91.7:3[introspection?,jpeg?,tiff?]
 	>=dev-libs/glib-2.25.15
 	>=dev-libs/libxml2-2
-	>=dev-libs/libpeas-0.7.0[gtk]
+	>=dev-libs/libpeas-0.7.2[gtk]
 	>=gnome-base/gnome-desktop-2.91.2:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.0
 	>=x11-themes/gnome-icon-theme-2.19.1
diff --git a/media-gfx/eog/files/eog-libpeas-compat.patch b/media-gfx/eog/files/eog-libpeas-compat.patch
new file mode 100644
index 00000000..f98066d4
--- /dev/null
+++ b/media-gfx/eog/files/eog-libpeas-compat.patch
@@ -0,0 +1,54 @@
+From 06d62c58d18a82974c6ef3d909d6056786015f23 Mon Sep 17 00:00:00 2001
+From: Garrett Regier <alias301@gmail.com>
+Date: Mon, 14 Feb 2011 13:27:42 +0000
+Subject: Update to latest libpeas API changes
+
+Plugin loaders now must be enabled
+not disabled.
+---
+diff --git a/configure.ac b/configure.ac
+index 69097bf..cc257a5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,8 +104,8 @@ EOG_MODULES="gtk+-3.0 >= $GTK_REQUIRED \
+              gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED \
+              shared-mime-info >= $SHARED_MIME_INFO_REQUIRED \
+              gsettings-desktop-schemas >= $DESKTOP_SCHEMAS_REQUIRED \
+-             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"
+ 
+ # Introspection
+ GOBJECT_INTROSPECTION_CHECK([0.9.3])
+diff --git a/src/eog-plugin-engine.c b/src/eog-plugin-engine.c
+index dfd0862..7997684 100644
+--- a/src/eog-plugin-engine.c
++++ b/src/eog-plugin-engine.c
+@@ -124,10 +124,8 @@ eog_plugin_engine_new (void)
+ 	engine = EOG_PLUGIN_ENGINE (g_object_new (EOG_TYPE_PLUGIN_ENGINE,
+ 						  NULL));
+ 
+-	/* Disable python and seed bindings as they are not working very
++	/* Don't enable python and seed bindings as they are not working very
+ 	 * well with eog yet (e.g. are having ref counting issues). */
+-	peas_engine_disable_loader (PEAS_ENGINE (engine), "python");
+-	peas_engine_disable_loader (PEAS_ENGINE (engine), "seed");
+ 
+ 	user_plugin_path = g_build_filename (eog_util_dot_dir (),
+ 					     USER_EOG_PLUGINS_LOCATION, NULL);
+diff --git a/src/eog-preferences-dialog.c b/src/eog-preferences-dialog.c
+index 260f29b..f5e9c87 100644
+--- a/src/eog-preferences-dialog.c
++++ b/src/eog-preferences-dialog.c
+@@ -255,7 +255,7 @@ eog_preferences_dialog_constructor (GType type,
+ 	g_settings_bind (priv->fullscreen_settings, EOG_CONF_FULLSCREEN_SECONDS,
+ 			 seconds_spin, "value", G_SETTINGS_BIND_DEFAULT);
+ 
+-        plugin_manager = peas_gtk_plugin_manager_new ();
++        plugin_manager = peas_gtk_plugin_manager_new (NULL);
+ 
+         g_assert (plugin_manager != NULL);
+ 
+--
+cgit v0.8.3.4