summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-02-22 05:25:44 +0530
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-02-22 05:25:44 +0530
commita569f0b4b173966905b28edddaa570bf094d7e68 (patch)
treef45533be5d1d6baffaa71f89d1967600ce21dabe /media-gfx/eog
parentx11-libs/libwnck: bump to 2.91.90, rename binaries (diff)
downloadgnome-a569f0b4b173966905b28edddaa570bf094d7e68.tar.gz
gnome-a569f0b4b173966905b28edddaa570bf094d7e68.tar.bz2
gnome-a569f0b4b173966905b28edddaa570bf094d7e68.zip
media-gfx/eog: 2.91.7 -> 2.91.90
Diffstat (limited to 'media-gfx/eog')
-rw-r--r--media-gfx/eog/Manifest7
-rw-r--r--media-gfx/eog/eog-2.91.90.ebuild (renamed from media-gfx/eog/eog-2.91.7-r1.ebuild)4
-rw-r--r--media-gfx/eog/eog-9999.ebuild2
-rw-r--r--media-gfx/eog/files/eog-libpeas-compat.patch54
4 files changed, 4 insertions, 63 deletions
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 3a286d70..96cc47d6 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,4 +1,3 @@
-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-r1.ebuild 1749 RMD160 3495b542afc78f8b11761d284e35a066891ef9f9 SHA1 2fdf41216625eb65bcd9337c918e1bbb6be839bf SHA256 b5b999bb85875bfa06ee6ae266b6d24dc19be6cde6bb3d09893bf47f95763951
-EBUILD eog-9999.ebuild 1674 RMD160 65a2aafb3859d329e3c91a48b7ce73b4b3b7da52 SHA1 c4353b84cd7a71d381c5979f0e79c3a480667ac1 SHA256 901e97f40f14ab3dcb8b56f4af3c830144e4c9465a8418febb12e5cf3ca6b154
+DIST eog-2.91.90.tar.bz2 3019741 RMD160 bac04d1992e6db19eb746f566df345edbfa59910 SHA1 ef585264d2d2219bbfdef66011afcf6dba746cc7 SHA256 9dd772f8f2e4ad045b4521e95a249d2ff7c0840b98fba1b8f4e47ca3edd4eff5
+EBUILD eog-2.91.90.ebuild 1681 RMD160 9c437642a53d34fc7daa6b4db685fae5e2dd833a SHA1 a14fcb9d472607a3995e0ff85e3f34599210e96f SHA256 1ea09d1a6378b9d4f7757610ee192bea73148b82c0f48b56ae046929542f1c56
+EBUILD eog-9999.ebuild 1681 RMD160 9c437642a53d34fc7daa6b4db685fae5e2dd833a SHA1 a14fcb9d472607a3995e0ff85e3f34599210e96f SHA256 1ea09d1a6378b9d4f7757610ee192bea73148b82c0f48b56ae046929542f1c56
diff --git a/media-gfx/eog/eog-2.91.7-r1.ebuild b/media-gfx/eog/eog-2.91.90.ebuild
index e946f0dd..75b4f40f 100644
--- a/media-gfx/eog/eog-2.91.7-r1.ebuild
+++ b/media-gfx/eog/eog-2.91.90.ebuild
@@ -61,7 +61,3 @@ 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 e622082f..75b4f40f 100644
--- a/media-gfx/eog/eog-9999.ebuild
+++ b/media-gfx/eog/eog-9999.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/"
diff --git a/media-gfx/eog/files/eog-libpeas-compat.patch b/media-gfx/eog/files/eog-libpeas-compat.patch
deleted file mode 100644
index f98066d4..00000000
--- a/media-gfx/eog/files/eog-libpeas-compat.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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