Version bump wrt #316735 by "Footkill" and Olivier Rolland.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

11 files changed, 258 insertions, 354 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index 127169199908..19190f43c4a0 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ogmrip
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.38 2009/12/31 09:13:47 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.39 2010/04/26 19:11:35 ssuominen Exp $
+
+*ogmrip-0.13.4 (26 Apr 2010)
+
+  26 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +ogmrip-0.13.4.ebuild,
+  +files/ogmrip-0.13.4-gtk.patch, +files/ogmrip-0.13.4-suboptions.patch:
+  Version bump wrt #316735 by "Footkill" and Olivier Rolland.
 
 *ogmrip-0.13.3 (31 Dec 2009)
 
diff --git a/media-video/ogmrip/files/ogmrip-0.13.0-libdvdread.patch b/media-video/ogmrip/files/ogmrip-0.13.0-libdvdread.patch
deleted file mode 100644
index f42f3e5d9d82..000000000000
--- a/media-video/ogmrip/files/ogmrip-0.13.0-libdvdread.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in	2009-07-14 19:48:33.000000000 +0200
-+++ configure.in	2009-07-18 12:40:39.000000000 +0200
-@@ -201,7 +201,9 @@
- 
- AC_LANG(C)
- 
--AC_COMPILE_IFELSE([
-+LIBS="-ldvdread"
-+
-+AC_LINK_IFELSE([
- #include <stdio.h>
- #include <inttypes.h>
- #include <dvdread/dvd_reader.h>
-@@ -212,7 +214,7 @@
-   AC_DEFINE(HAVE_DVD_FILE_STAT, 1, [Define to 1 if DVDFileStat is available.])
- fi
- 
--AC_COMPILE_IFELSE([
-+AC_LINK_IFELSE([
- #include <stdio.h>
- #include <inttypes.h>
- #include <dvdread/dvd_reader.h>
diff --git a/media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch b/media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch
deleted file mode 100644
index 76951ff4492c..000000000000
--- a/media-video/ogmrip/files/ogmrip-0.13.0-no-profile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/ogmrip-main.c
-===================================================================
---- src/ogmrip-main.c	(révision 1788)
-+++ src/ogmrip-main.c	(copie de travail)
-@@ -1012,9 +1012,15 @@
-     return NULL;
-   }
- 
-+  profile = ogmrip_options_dialog_get_active_profile (OGMRIP_OPTIONS_DIALOG (data->options_dialog));
-+  if (!profile)
-+  {
-+    g_set_error (error, OGMDVD_DISC_ERROR, OGMDVD_DISC_ERROR_UNKNOWN, "<b>%s</b>\n\n%s", 
-+        _("No available profile"), _("You must create at least one profile before you can encode."));
-+    return NULL;
-+  }
-+
-   encoding = ogmrip_encoding_new (title, OGMRIP_DEFAULT_FILE_NAME ".avi");
--
--  profile = ogmrip_options_dialog_get_active_profile (OGMRIP_OPTIONS_DIALOG (data->options_dialog));
-   ogmrip_encoding_set_profile (encoding, profile);
- 
-   ogmrip_encoding_set_label (encoding, gtk_entry_get_text (GTK_ENTRY (data->title_entry)));
diff --git a/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch b/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch
new file mode 100644
index 000000000000..0e1a8fc59f8f
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.4-gtk.patch
@@ -0,0 +1,64 @@
+Index: src/ogmrip-main.c
+===================================================================
+--- src/ogmrip-main.c	(révision 1960)
++++ src/ogmrip-main.c	(copie de travail)
+@@ -1452,7 +1452,7 @@
+ 
+   ogmrip_encoding_set_relative (encoding,
+ #if GTK_CHECK_VERSION(2,18,0)
+-      gtk_widget_get_sensitive (data->relative_check) &
++      gtk_widget_is_sensitive (data->relative_check) &
+ #else
+       GTK_WIDGET_IS_SENSITIVE (data->relative_check) &
+ #endif
+Index: src/ogmrip-options-dialog.c
+===================================================================
+--- src/ogmrip-options-dialog.c	(révision 1960)
++++ src/ogmrip-options-dialog.c	(copie de travail)
+@@ -971,13 +971,21 @@
+   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_ENQUEUE);
+   gtk_widget_show (widget);
+ 
++#if GTK_CHECK_VERSION(2,18,0)
++  gtk_widget_set_can_focus (widget, TRUE);
++#else
+   GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
++#endif
+ 
+   widget = gtk_button_new_with_image (_("E_xtract"), GTK_STOCK_CONVERT);
+   gtk_dialog_add_action_widget (GTK_DIALOG (dialog), widget, OGMRIP_RESPONSE_EXTRACT);
+   gtk_widget_show (widget);
+ 
++#if GTK_CHECK_VERSION(2,18,0)
++  gtk_widget_set_can_focus (widget, TRUE);
++#else
+   GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
++#endif
+ 
+   ogmrip_settings_bind_custom (settings, OGMRIP_GCONF_GENERAL, OGMRIP_GCONF_PROFILE,
+       G_OBJECT (OGMRIP_OPTIONS_DIALOG (dialog)->priv->profile_combo), "active",
+@@ -1294,7 +1302,7 @@
+ 
+   return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->test_check)) &&
+ #if GTK_CHECK_VERSION(2,18,0)
+-    gtk_widget_get_sensitive (dialog->priv->test_check);
++    gtk_widget_is_sensitive (dialog->priv->test_check);
+ #else
+     GTK_WIDGET_IS_SENSITIVE (dialog->priv->test_check);
+ #endif
+Index: libogmrip-gtk/ogmrip-source-chooser-widget.c
+===================================================================
+--- libogmrip-gtk/ogmrip-source-chooser-widget.c	(révision 1960)
++++ libogmrip-gtk/ogmrip-source-chooser-widget.c	(copie de travail)
+@@ -543,7 +543,11 @@
+ 
+         toplevel = gtk_widget_get_toplevel (GTK_WIDGET (chooser));
+ 
++#if GTK_CHECK_VERSION(2,18,0)
++        if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
++#else
+         if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
++#endif
+         {
+           if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (chooser->priv->dialog)))
+             gtk_window_set_transient_for (GTK_WINDOW (chooser->priv->dialog), GTK_WINDOW (toplevel));
diff --git a/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch b/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch
new file mode 100644
index 000000000000..b8596feed692
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.4-suboptions.patch
@@ -0,0 +1,98 @@
+--- libogmrip/ogmrip-x264.c.orig	2010-04-13 09:21:48.000000000 +0200
++++ libogmrip/ogmrip-x264.c	2010-04-13 09:19:34.000000000 +0200
+@@ -835,7 +835,7 @@
+ ogmrip_x264_check_option (const gchar *option)
+ {
+   GPtrArray *argv;
+-  gchar *options;
++  gchar *options, *output = NULL;
+   gint status;
+ 
+   argv = g_ptr_array_new ();
+@@ -843,7 +843,7 @@
+   g_ptr_array_add (argv, "mencoder");
+   g_ptr_array_add (argv, "-nocache");
+   g_ptr_array_add (argv, "-nosound");
+-  g_ptr_array_add (argv, "-really-quiet");
++  g_ptr_array_add (argv, "-quiet");
+   g_ptr_array_add (argv, "-frames");
+   g_ptr_array_add (argv, "0");
+   g_ptr_array_add (argv, "-rawvideo");
+@@ -863,13 +863,26 @@
+   g_ptr_array_add (argv, NULL);
+ 
+   g_spawn_sync (NULL, (gchar **) argv->pdata, NULL,
+-      G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+-      NULL, NULL, NULL, NULL, &status, NULL);
++      G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
++      NULL, NULL, NULL, &output, &status, NULL);
+   
+   g_ptr_array_free (argv, TRUE);
+ 
+   g_free (options);
+ 
++  if (status == 0 && output != NULL)
++  {
++    gchar *substr;
++
++    substr = g_strdup_printf ("Option x264encopts: Unknown suboption %s", option);
++    if (strstr (output, substr))
++      status = 1;
++    g_free (substr);
++  }
++
++  if (output)
++    g_free (output);
++
+   return status == 0;
+ }
+ 
+--- libogmrip/ogmrip-xvid.c.orig	2010-04-13 09:21:23.000000000 +0200
++++ libogmrip/ogmrip-xvid.c	2010-04-13 09:19:39.000000000 +0200
+@@ -851,7 +851,7 @@
+ ogmrip_xvid_check_option (const gchar *option)
+ {
+   GPtrArray *argv;
+-  gchar *options;
++  gchar *options, *output = NULL;
+   gint status;
+ 
+   argv = g_ptr_array_new ();
+@@ -859,7 +859,7 @@
+   g_ptr_array_add (argv, "mencoder");
+   g_ptr_array_add (argv, "-nocache");
+   g_ptr_array_add (argv, "-nosound");
+-  g_ptr_array_add (argv, "-really-quiet");
++  g_ptr_array_add (argv, "-quiet");
+   g_ptr_array_add (argv, "-frames");
+   g_ptr_array_add (argv, "0");
+   g_ptr_array_add (argv, "-rawvideo");
+@@ -879,13 +879,26 @@
+   g_ptr_array_add (argv, NULL);
+ 
+   g_spawn_sync (NULL, (gchar **) argv->pdata, NULL,
+-      G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+-      NULL, NULL, NULL, NULL, &status, NULL);
++      G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
++      NULL, NULL, NULL, &output, &status, NULL);
+ 
+   g_ptr_array_free (argv, TRUE);
+ 
+   g_free (options);
+ 
++  if (status == 0 && output != NULL)
++  {
++    gchar *substr;
++
++    substr = g_strdup_printf ("Option xvidencopts: Unknown suboption %s", option);
++    if (strstr (output, substr))
++      status = 1;
++    g_free (substr);
++  }
++
++  if (output)
++    g_free (output);
++
+   return status == 0;
+ }
+ 
diff --git a/media-video/ogmrip/files/ogmrip-werror.patch b/media-video/ogmrip/files/ogmrip-werror.patch
deleted file mode 100644
index 4aa17b14ae76..000000000000
--- a/media-video/ogmrip/files/ogmrip-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(révision 1592)
-+++ configure.in	(copie de travail)
-@@ -37,7 +37,7 @@
- 
- AM_MAINTAINER_MODE
- 
--CFLAGS="$CFLAGS -I/usr/local/include -I.. -Wall -Werror"
-+CFLAGS="$CFLAGS -I/usr/local/include -I.. -Wall"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- 
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic -L/usr/local/lib -L/usr/pkg/lib"
diff --git a/media-video/ogmrip/ogmrip-0.12.3.ebuild b/media-video/ogmrip/ogmrip-0.12.3.ebuild
deleted file mode 100644
index fb9f240f70e3..000000000000
--- a/media-video/ogmrip/ogmrip-0.12.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.12.3.ebuild,v 1.2 2009/03/22 13:19:43 loki_val Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 ogm png spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=app-i18n/enca-1.0
-	>=media-libs/libdvdread-0.9.7
-	>=media-video/mplayer-1.0_pre4[dvd,encode,xvid?,dts?,x264?]
-	virtual/eject
-	aac? ( >=media-libs/faac-1.24 )
-	gtk? ( >=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.6
-		>=gnome-base/libglade-2.5
-		libnotify? ( >=x11-libs/gtk+-2.10
-			>=x11-libs/libnotify-0.4.3 )
-		media-video/mplayer[jpeg] )
-	hal? ( >=sys-apps/hal-0.4.2 )
-	matroska? ( >=media-video/mkvtoolnix-0.9 )
-	mp3? ( >=media-sound/lame-3.96 )
-	mp4? ( >=media-video/gpac-0.4.2 )
-	ogm? ( >=media-sound/ogmtools-1.4 )
-	png? ( media-libs/libpng )
-	spell? ( >=app-text/enchant-1.1 )
-	srt? ( || ( ( >=app-text/tesseract-2.00 media-libs/tiff )
-		>=app-text/gocr-0.39
-		>=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1.0_alpha6 )
-	vorbis? ( >=media-sound/vorbis-tools-1.0 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.4-r1
-		 >=dev-libs/libxslt-1.1.20-r1 )"
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-werror.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)"
-}
-
-src_configure() {
-	gnome2_src_configure
-}
-
-src_compile(){
-	emake || die "emake failed"
-}
diff --git a/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild b/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild
deleted file mode 100644
index 58f1fbcc863f..000000000000
--- a/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.0-r1.ebuild,v 1.1 2009/09/24 00:01:26 beandog Exp $
-
-EAPI=2
-inherit autotools eutils gnome2
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz
-	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=app-i18n/enca-1
-	>=media-libs/libdvdread-0.9.6
-	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
-	virtual/eject
-	aac? ( >=media-libs/faac-1.26 )
-	gtk? ( >=x11-libs/gtk+-2.12
-		>=gnome-base/gconf-2.24
-		>=gnome-base/libglade-2.6.3
-		libnotify? ( >=x11-libs/libnotify-0.4.4 )
-		media-video/mplayer[jpeg] )
-	hal? ( >=sys-apps/hal-0.5.9 )
-	matroska? ( >=media-video/mkvtoolnix-2.4 )
-	mp3? ( >=media-sound/lame-3.98 )
-	mp4? ( >=media-video/gpac-0.4.4 )
-	ogm? ( >=media-sound/ogmtools-1.3 )
-	spell? ( >=app-text/enchant-1.2 )
-	srt? ( media-libs/libpng
-		|| ( ( >=app-text/tesseract-2 media-libs/tiff )
-		>=app-text/gocr-0.45 >=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1 )
-	vorbis? ( >=media-sound/vorbis-tools-1.2 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.35 )
-	dev-util/gtk-doc-am
-	>=dev-util/pkgconfig-0.12
-	doc? ( >=dev-libs/libxslt-1.1.24 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
-
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable mp4 mp4-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)
-		$(use_enable nls)
-		--disable-gtk-doc"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-libdvdread.patch
-	epatch "${FILESDIR}"/${P}-no-profile.patch
-	AT_M4DIR=${WORKDIR} eautoreconf
-}
diff --git a/media-video/ogmrip/ogmrip-0.13.0.ebuild b/media-video/ogmrip/ogmrip-0.13.0.ebuild
deleted file mode 100644
index f51529b770f4..000000000000
--- a/media-video/ogmrip/ogmrip-0.13.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.0.ebuild,v 1.1 2009/07/21 20:36:08 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils gnome2
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz
-	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug doc dts gtk hal libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=app-i18n/enca-1
-	>=media-libs/libdvdread-0.9.6
-	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
-	virtual/eject
-	aac? ( >=media-libs/faac-1.26 )
-	gtk? ( >=x11-libs/gtk+-2.12
-		>=gnome-base/gconf-2.24
-		>=gnome-base/libglade-2.6.3
-		libnotify? ( >=x11-libs/libnotify-0.4.4 )
-		media-video/mplayer[jpeg] )
-	hal? ( >=sys-apps/hal-0.5.9 )
-	matroska? ( >=media-video/mkvtoolnix-2.4 )
-	mp3? ( >=media-sound/lame-3.98 )
-	mp4? ( >=media-video/gpac-0.4.4 )
-	ogm? ( >=media-sound/ogmtools-1.3 )
-	spell? ( >=app-text/enchant-1.2 )
-	srt? ( media-libs/libpng
-		|| ( ( >=app-text/tesseract-2 media-libs/tiff )
-		>=app-text/gocr-0.45 >=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1 )
-	vorbis? ( >=media-sound/vorbis-tools-1.2 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.35 )
-	dev-util/gtk-doc-am
-	>=dev-util/pkgconfig-0.12
-	doc? ( >=dev-libs/libxslt-1.1.24 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
-
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable hal hal-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable mp4 mp4-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)
-		$(use_enable nls)
-		--disable-gtk-doc"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${P}-libdvdread.patch
-	AT_M4DIR=${WORKDIR} eautoreconf
-}
diff --git a/media-video/ogmrip/ogmrip-0.13.3.ebuild b/media-video/ogmrip/ogmrip-0.13.3.ebuild
deleted file mode 100644
index 8b34c978dd1f..000000000000
--- a/media-video/ogmrip/ogmrip-0.13.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.3.ebuild,v 1.1 2009/12/31 09:13:47 hollow Exp $
-
-EAPI=2
-inherit eutils gnome2
-
-DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
-HOMEPAGE="http://ogmrip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aac debug dbus doc dts gtk libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=app-i18n/enca-1
-	>=media-libs/libdvdread-0.9.6
-	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
-	aac? ( >=media-libs/faac-1.26 )
-	gtk? ( >=x11-libs/gtk+-2.12
-		>=gnome-base/gconf-2.24
-		>=gnome-base/libglade-2.6.3
-		dbus? ( >=dev-libs/dbus-glib-0.76 )
-		libnotify? ( >=x11-libs/libnotify-0.4.4 )
-		media-video/mplayer[jpeg] )
-	matroska? ( >=media-video/mkvtoolnix-2.4 )
-	mp3? ( >=media-sound/lame-3.98 )
-	mp4? ( >=media-video/gpac-0.4.4 )
-	ogm? ( >=media-sound/ogmtools-1.3 )
-	spell? ( >=app-text/enchant-1.2 )
-	srt? ( media-libs/libpng
-		|| ( ( >=app-text/tesseract-2 media-libs/tiff )
-		>=app-text/gocr-0.45 >=app-text/ocrad-0.15 ) )
-	theora? ( >=media-libs/libtheora-1 )
-	vorbis? ( >=media-sound/vorbis-tools-1.2 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.35 )
-	dev-util/gtk-doc-am
-	>=dev-util/pkgconfig-0.12
-	doc? ( >=dev-libs/libxslt-1.1.24 )"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog README TODO"
-
-	G2CONF="${G2CONF}
-		$(use_enable aac aac-support)
-		$(use_enable dbus dbus-support)
-		$(use_enable debug maintainer-mode)
-		$(use_enable gtk gtk-support)
-		$(use_enable libnotify libnotify-support)
-		$(use_enable matroska mkv-support)
-		$(use_enable mp3 mp3-support)
-		$(use_enable mp4 mp4-support)
-		$(use_enable ogm ogm-support)
-		$(use_enable spell enchant-support)
-		$(use_enable srt srt-support)
-		$(use_enable theora theora-support)
-		$(use_enable vorbis vorbis-support)
-		$(use_enable x264 x264-support)
-		$(use_enable xvid xvid-support)
-		$(use_enable nls)
-		--disable-gtk-doc"
-}
diff --git a/media-video/ogmrip/ogmrip-0.13.4.ebuild b/media-video/ogmrip/ogmrip-0.13.4.ebuild
new file mode 100644
index 000000000000..26c3bfb9e539
--- /dev/null
+++ b/media-video/ogmrip/ogmrip-0.13.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.4.ebuild,v 1.1 2010/04/26 19:11:35 ssuominen Exp $
+
+EAPI=2
+GCONF_DEBUG=no
+inherit eutils gnome2
+
+DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="aac dbus dts gtk libnotify matroska mp3 mp4 nls ogm spell srt theora vorbis x264 xvid"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=app-i18n/enca-1.9
+	dev-libs/libxml2
+	media-libs/libdvdread
+	>=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?]
+	aac? ( >=media-libs/faac-1.24 )
+	gtk? (
+		>=x11-libs/gtk+-2.12:2
+		gnome-base/libglade
+		gnome-base/gconf
+		dbus? ( dev-libs/dbus-glib )
+		libnotify? ( >=x11-libs/libnotify-0.4.3 )
+		media-video/mplayer[jpeg]
+		)
+	matroska? ( media-video/mkvtoolnix )
+	mp3? ( media-sound/lame )
+	mp4? ( >=media-video/gpac-0.4.2 )
+	ogm? ( media-sound/ogmtools )
+	spell? ( >=app-text/enchant-1.1.0 )
+	srt? ( ||
+		(
+			( >=app-text/tesseract-2 media-libs/tiff )
+			>=app-text/gocr-0.39
+			>=app-text/ocrad-0.15
+		)
+		media-libs/libpng )
+	theora? ( media-libs/libtheora )
+	vorbis? ( media-sound/vorbis-tools )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog README TODO"
+
+	G2CONF="--disable-dependency-tracking
+		--disable-static
+		$(use_enable gtk gtk-support)
+		$(use_enable dbus dbus-support)
+		$(use_enable spell enchant-support)
+		$(use_enable ogm ogm-support)
+		$(use_enable matroska mkv-support)
+		$(use_enable mp4 mp4-support)
+		$(use_enable xvid xvid-support)
+		$(use_enable x264 x264-support)
+		$(use_enable theora theora-support)
+		$(use_enable vorbis vorbis-support)
+		$(use_enable mp3 mp3-support)
+		$(use_enable aac aac-support)
+		$(use_enable srt srt-support)
+		$(use_enable libnotify libnotify-support)
+		$(use_enable nls)
+		--with-html-dir=/usr/share/doc/${PF}/html"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch \
+		"${FILESDIR}"/${P}-suboptions.patch
+
+	sed -i \
+		-e '/DISABLE_DEPRECATED/d' \
+		configure || die
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name '*.la' -delete
+}