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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 65 insertions, 11 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/Manifest b/media-video/shrip/Manifest
index 94022e3484a9..e59f9e92709c 100644
--- a/media-video/shrip/Manifest
+++ b/media-video/shrip/Manifest
@@ -1,4 +1,5 @@
+AUX shrip-0.5.0-wur.patch 889 RMD160 4c29775fdda797a8026a14c4d5f73bc216b939c5 SHA1 5cd4464f359638b709fcc08e1b5d1aa0292142e6 SHA256 07b3ed04a67c9be85ff47362ad2a47f462aa41da2ec0fe45870380417f2ba104
 DIST shrip-0.5.0.tar.gz 375545 RMD160 b485624ef400558bdbd0b90e012fe92c1a95437b SHA1 8634d85fc803e7d63f7cf8ebb61fcbd553370847 SHA256 1909c41fe81bd3e3335a1d2fbe9d6f8d6295c89100cae44427534ce009f7f671
-EBUILD shrip-0.5.0.ebuild 867 RMD160 b668be85038797bb71d03fda3f2a5f4501083a53 SHA1 869154dfb782828526b9976d39498d7634012fdd SHA256 861c8e5eda01aa397544f3182c4680c4aacfc79e083b528de71234586fef9056
-MISC ChangeLog 777 RMD160 19343744b818d9db5710b644dcbdbf4ccc7a87c2 SHA1 17e653dacbe3c900b4f1c7839832ea488d8d0e1e SHA256 7005d766c68f85d3e112709424b13cdfc5889f5167d5c398eeef031d6d8433ee
+EBUILD shrip-0.5.0-r1.ebuild 1048 RMD160 18ee9c772451b6cfb5e46e8e1202d8d9f41702ff SHA1 721cf5f40aec946854df4921f8617c138045820e SHA256 756665d1145344c64c47872779aa2ff9b244801e23040b0d4d13d60382f52e9b
+MISC ChangeLog 994 RMD160 6ce11e34bddc7fee2aaea13e49a7a4a3f75778e7 SHA1 55c166ac9e279cc6e58bd81017a02caf511fea83 SHA256 d7e77e8399d675e308973fddd6a87f07541d502f809ccdedf05c7dad85a5be85
 MISC metadata.xml 295 RMD160 ad35b5022d11deca2c7f342d7cafd206bdf2ac58 SHA1 d9abe631cac8d0663b42a3472ac30bdb67518ea1 SHA256 f2c1cd1adf19f91c03e018bfe0e16af0b1a31079f04f6e9ca565d8737760f762
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() {