Fix bug 251367, work around 260847, adjust deps for 278726.

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 62 insertions, 9 deletions

diff --git a/media-video/shrip/ChangeLog b/media-video/shrip/ChangeLog
index 39f1086faa59..bc46eb8f1fd5 100644
--- a/media-video/shrip/ChangeLog
+++ b/media-video/shrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/shrip
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/ChangeLog,v 1.4 2008/12/18 14:35:11 beandog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/ChangeLog,v 1.5 2009/07/22 19:10:05 gengor Exp $
+
+*shrip-0.5.0-r1 (22 Jul 2009)
+
+  22 Jul 2009; Gordon Malm <gengor@gentoo.org> -shrip-0.5.0.ebuild,
+  +shrip-0.5.0-r1.ebuild, +files/shrip-0.5.0-wur.patch:
+  Fix bug 251367, work around 260847, adjust deps for 278726.
 
 *shrip-0.5.0 (18 Dec 2008)
 
diff --git a/media-video/shrip/files/shrip-0.5.0-wur.patch b/media-video/shrip/files/shrip-0.5.0-wur.patch
new file mode 100644
index 000000000000..651067b8d3b4
--- /dev/null
+++ b/media-video/shrip/files/shrip-0.5.0-wur.patch
@@ -0,0 +1,33 @@
+Gentoo Bug #251367 : http://bugs.gentoo.org/show_bug.cgi?id=251367
+
+--- src/shrip-common.c
++++ src/shrip-common.c
+@@ -1567,13 +1567,14 @@
+   gchar *cwd, *message;
+   gint result;
+ 
++  cwd = g_get_current_dir ();
++  if (chdir (ogmrip_fs_get_tmp_dir ()) < 0)
++    return OGMJOB_RESULT_ERROR;
++
+   message = g_strdup (_("Merging audio and video streams"));
+   g_signal_connect (container, "progress", G_CALLBACK (progress), message);
+   g_signal_connect (container, "run", G_CALLBACK (run), NULL);
+ 
+-  cwd = g_get_current_dir ();
+-  chdir (ogmrip_fs_get_tmp_dir ());
+-
+   spawn = OGMJOB_SPAWN (container);
+   result = ogmjob_spawn_run (OGMJOB_SPAWN (container), &tmp_error);
+   spawn = NULL;
+@@ -1584,7 +1585,9 @@
+   if (tmp_error)
+     g_propagate_error (error, tmp_error);
+ 
+-  chdir (cwd);
++  if (chdir (cwd) < 0)
++    result = OGMJOB_RESULT_ERROR;
++
+   g_free (cwd);
+ 
+   return result;
diff --git a/media-video/shrip/shrip-0.5.0.ebuild b/media-video/shrip/shrip-0.5.0-r1.ebuild
index 8b43f9c6d4e9..9afce82eb00d 100644
--- a/media-video/shrip/shrip-0.5.0.ebuild
+++ b/media-video/shrip/shrip-0.5.0-r1.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/shrip-0.5.0.ebuild,v 1.1 2008/12/18 14:35:11 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/shrip-0.5.0-r1.ebuild,v 1.1 2009/07/22 19:10:05 gengor Exp $
+
+EAPI=2
+
+inherit autotools eutils
 
 DESCRIPTION="Command line tool for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
 HOMEPAGE="http://ogmrip.sourceforge.net/"
@@ -11,16 +15,26 @@ IUSE="debug"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=dev-libs/glib-2.6
-	>=media-video/ogmrip-0.12.2"
+	>=media-video/ogmrip-0.12.2
+	<media-video/ogmrip-0.13.0"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.12.0"
 
-src_compile() {
-	myconf="$(use_enable debug maintainer-mode)"
+src_prepare() {
+	# Bug #260847
+	sed -i -e 's: -Werror::' configure.in || die "sed failed"
+
+	# Bug #251367
+	epatch "${FILESDIR}/${P}-wur.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_enable debug maintainer-mode)"
 
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
+	econf ${myconf}
 }
 
 src_install() {