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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

12 files changed, 263 insertions, 366 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/Manifest b/media-video/ogmrip/Manifest
index b5f1a7583213..0b9c2cfa054e 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,13 +1,6 @@
-AUX ogmrip-0.13.0-libdvdread.patch 498 RMD160 e68aedc68c45be5111bcbebfe5fb7ffa0ba40c1c SHA1 ebfa6cf9de3b0e3a8369f0e5050dca660298f29b SHA256 e82e1f0268d519c90abb6c22de65e32c78651f05f4d9cffaa63db0083eca8874
-AUX ogmrip-0.13.0-no-profile.patch 891 RMD160 32e619e412667345ed765bd7a33f330f515366bc SHA1 8a4812adab9926dde6a254fa3043855abfb9d2e7 SHA256 b430ccb4369a39d9091c11f9533f67c677e0ba1dee2d0f70557117de46651922
-AUX ogmrip-werror.patch 426 RMD160 b3e5eef6f464ff15809a5558f72ace8ce54be9ae SHA1 8358359be19bf718a96b3067279ed84caade8445 SHA256 c76a69fa82ad9d3f69c2002be8465974cf3ed6ca8a00f2b588ba11ee25b031d1
-DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
-DIST ogmrip-0.12.3.tar.gz 2883021 RMD160 7f91b5bb763646a67b2f50080f8a3bb36acd13ff SHA1 237a9d59acb6d45189dd31613898ff4ffd09bc43 SHA256 9e56dc14d82fdd8e89c708279f2389f7fcde53615e8c13ac85c24c63954edcd1
-DIST ogmrip-0.13.0.tar.gz 3275788 RMD160 30706983b52cfa80ab1f2422de785411c048553d SHA1 06b0facadc5bcc7af59c3b38f3230877c1ee8997 SHA256 d2553c11969e8e0f13d27ee9a3d9141f4af6daddf46530cf47a4f5ef17e8cec6
-DIST ogmrip-0.13.3.tar.gz 3299361 RMD160 7d7591f7ad2c8d11c10e6093543723830e1edc28 SHA1 35a0a23551624b7759e59c0b0ee47b4021541e77 SHA256 62905ce4ad12738bcc348042050c5c7dd3e36f50b8878150d03df9cff76d58ca
-EBUILD ogmrip-0.12.3.ebuild 2317 RMD160 b7e6edd963c9f5bc8cfd34e8464ead4070926854 SHA1 c103238aa267d9d5480e8b5e000dc76f05b2dca4 SHA256 a1331e91165d68538ffe95756105260055ebe44e34515c1f4bf14890592325fd
-EBUILD ogmrip-0.13.0-r1.ebuild 2404 RMD160 58c0aebaac0c893c130b6ed4a394ea91d42e2f4a SHA1 5ec16a5f733f799e7a9fa07d1624d71e5074a85f SHA256 12131a7ec03c50cd9dea4d67ec88b7b1649c2f6539253cf33393e8df1d6276ab
-EBUILD ogmrip-0.13.0.ebuild 2359 RMD160 ff290daaf543752f63174d2e2c6bbaa52b2543c5 SHA1 5a4b721c5b631c9d318bf319f2a7376c7417623b SHA256 6468fb74df90c537403106c791c4bce8162568c2e887c1c7d7328e63d00903f0
-EBUILD ogmrip-0.13.3.ebuild 2173 RMD160 3d05de83303a4f576555f7395407a0b101c07d64 SHA1 6f029aaf57f2e311202e43b56b04b4efd60fec0b SHA256 229dbd3b9a9acdc4feae4fb0e21f7c3d33c9a676f1c6c1564ef42b6de7edb92e
-MISC ChangeLog 7231 RMD160 03ff6c77c6acd8a2f52b9ae7ba574270f8d2ec76 SHA1 992ec24834ffca1e634c4edb57a667ba488b1ba2 SHA256 a4180337a05f530863a818222dc1dae083bfe03330cde231c1913be61bdb7851
+AUX ogmrip-0.13.4-gtk.patch 2539 RMD160 fad5278ae198c0ba36800a7519c69788ce7410a5 SHA1 92e745d7d0197dac4ac242b782034cd322bd8c2b SHA256 71d4845d7b3500958ee94a7551b1af4806f4d9e21c3e70c280f4fdc54723e6b4
+AUX ogmrip-0.13.4-suboptions.patch 2728 RMD160 94427aaef912fe0c679e33985246091605b59f0a SHA1 5de9d36a754b2496d34f9b93436ef7731337bcb7 SHA256 a101765ea13f0e3942450d5eebd5734d65694d5c916671439f8ca7b70c46305f
+DIST ogmrip-0.13.4.tar.gz 3322432 RMD160 62951486f4bcfcdcf7075efb203ed4c620b259ec SHA1 dfe48d174107ff4d2b55e69b82fbf84e37498ab2 SHA256 b954bb2b990933a7abbb6fab8fcf7d7edd1cde8b0a9c790806cd16ddc9c4b068
+EBUILD ogmrip-0.13.4.ebuild 2368 RMD160 e3bade7d45c7e2a3eb68ebcbe56b916c08ef91ae SHA1 3d016b0958420e5806c7ef9590ab21c9e9e8b3e1 SHA256 4e203463d7f04548c1854cf0a638cfc1f657f6e989b4256cd9562bf26eab12af
+MISC ChangeLog 7477 RMD160 9b3e4933fd056a42474f46b67fd2cd8b49b374cb SHA1 d26ca3e5418d5b2854f9706841fb2a436daa5aea SHA256 36a955287211d1360d5aeb2aa1369b1f2040bdde0606f91575dea03720c9c415
 MISC metadata.xml 449 RMD160 b535f21bb82fe18f270c623e9246fada5d4f389a SHA1 d45301a60016eeda1698a9b02de8326ef4bbbeeb SHA256 7ddfc7f6e9ffd1f154c7bfad79dba0672cfc3da9d369d09175d06106eb345d36
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
+}