diff --git a/srcpkgs/eog/eog-devel.template b/srcpkgs/eog/eog-devel.template
index 7b7f983286b..ef4983b3e1b 100644
--- a/srcpkgs/eog/eog-devel.template
+++ b/srcpkgs/eog/eog-devel.template
@@ -8,27 +8,31 @@ long_desc="${long_desc}
 Add_dependency run pkg-config
 Add_dependency run intltool
 Add_dependency run gnome-doc-utils
+Add_dependency run which
 Add_dependency run gnome-desktop-devel
-Add_dependency run startup-notification-devel
-Add_dependency run GConf-devel
-Add_dependency run gtk+-devel
+Add_dependency run libpeas-devel
+Add_dependency run gtk+3-devel
 Add_dependency run atk-devel
-Add_dependency run glib-devel
-Add_dependency run pango-devel
-Add_dependency run cairo-devel
-Add_dependency run freetype-devel
-Add_dependency run fontconfig-devel
 Add_dependency run libexif-devel
 Add_dependency run lcms-devel
 Add_dependency run exempi-devel
 Add_dependency run dbus-glib-devel
-Add_dependency run dbus-devel
-Add_dependency run zlib-devel
+Add_dependency run librsvg-devel
+Add_dependency run glib-devel
+Add_dependency run gdk-pixbuf-devel
+Add_dependency run cairo-devel
 Add_dependency run jpeg-devel
 Add_dependency run libxml2-devel
 Add_dependency run libX11-devel
-Add_dependency run librsvg-devel
-Add_dependency run pygtk-devel
+Add_dependency run libgirepository-devel
+Add_dependency run zlib-devel
+Add_dependency run startup-notification-devel
+Add_dependency run pango-devel
+Add_dependency run freetype-devel
+Add_dependency run fontconfig-devel
+Add_dependency run libffi-devel
+Add_dependency run dbus-devel
+Add_dependency run libpng-devel
 
 do_install()
 {
@@ -36,4 +40,5 @@ do_install()
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}//usr/share/eog/gir-1.0 ${DESTDIR}/usr/share
 }
diff --git a/srcpkgs/eog/gir-eog.template b/srcpkgs/eog/gir-eog.template
new file mode 100644
index 00000000000..6783daccfa2
--- /dev/null
+++ b/srcpkgs/eog/gir-eog.template
@@ -0,0 +1,13 @@
+# Template file for 'gir-eog'.
+#
+short_desc="Introspection data for the Eye Of the Gnome."
+long_desc="${long_desc}
+
+ This package contains small pieces of introspection data for the
+ Eye Of the Gnome library."
+
+do_install()
+{
+	install -d ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/eog/girepository-1.0 ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template
index 5748a684fd5..75d75385a8a 100644
--- a/srcpkgs/eog/template
+++ b/srcpkgs/eog/template
@@ -1,74 +1,76 @@
 # Template file for 'eog'
 pkgname=eog
-version=2.32.1
-distfiles="${GNOME_SITE}/$pkgname/2.32/$pkgname-$version.tar.bz2"
+version=2.91.90
+distfiles="${GNOME_SITE}/eog/2.91/eog-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-schemas-install --localstatedir=/var
---with-gconf-schema-file-dir=/usr/share/gconf/schemas
---disable-scrollkeeper"
+configure_args="--disable-scrollkeeper --localstatedir=/var"
 short_desc="Eye of GNOME graphics viewer program"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078
+checksum=9dd772f8f2e4ad045b4521e95a249d2ff7c0840b98fba1b8f4e47ca3edd4eff5
 long_desc="
  eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
  which uses the gdk-pixbuf library. It can deal with large images, and zoom
  and scroll with constant memory usage. Its goals are simplicity and
  standards compliance."
 
-gconf_schemas="eog.schemas"
+triggers="gsettings-schemas"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
+subpackages="gir-eog eog-devel"
 
 Add_dependency run glibc
 Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run GConf
-Add_dependency run libpng
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
+Add_dependency run libpeas
+Add_dependency run gtk+3
 Add_dependency run atk
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
 Add_dependency run libexif
 Add_dependency run lcms
 Add_dependency run exempi
 Add_dependency run dbus-glib
-Add_dependency run dbus-libs
-Add_dependency run zlib
+Add_dependency run librsvg
+Add_dependency run glib
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
 Add_dependency run jpeg
 Add_dependency run libxml2
 Add_dependency run libX11
-Add_dependency run librsvg
+Add_dependency run libgirepository
+Add_dependency run zlib
+Add_dependency run startup-notification
+Add_dependency run pango
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libffi
+Add_dependency run dbus-libs
+Add_dependency run libpng
 
 Add_dependency build pkg-config
 Add_dependency build intltool
 Add_dependency build gnome-doc-utils
+Add_dependency build which
 Add_dependency build gnome-desktop-devel
-Add_dependency build startup-notification-devel
-Add_dependency build GConf-devel
-Add_dependency build gtk+-devel
+Add_dependency build libpeas-devel
+Add_dependency build gtk+3-devel
 Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
 Add_dependency build libexif-devel
 Add_dependency build lcms-devel
 Add_dependency build exempi-devel
 Add_dependency build dbus-glib-devel
-Add_dependency build dbus-devel
-Add_dependency build zlib-devel
+Add_dependency build librsvg-devel
+Add_dependency build glib-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build cairo-devel
 Add_dependency build jpeg-devel
 Add_dependency build libxml2-devel
 Add_dependency build libX11-devel
-Add_dependency build pygtk-devel
-Add_dependency build librsvg-devel
-Add_dependency build which
+Add_dependency build libgirepository-devel
+Add_dependency build zlib-devel
+Add_dependency build startup-notification-devel
+Add_dependency build pango-devel
+Add_dependency build freetype-devel
+Add_dependency build fontconfig-devel
+Add_dependency build libffi-devel
+Add_dependency build dbus-devel
+Add_dependency build libpng-devel
 
-Add_dependency full gnome-icon-theme
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
diff --git a/srcpkgs/gir-eog b/srcpkgs/gir-eog
new file mode 120000
index 00000000000..08e89b60634
--- /dev/null
+++ b/srcpkgs/gir-eog
@@ -0,0 +1 @@
+eog
\ No newline at end of file