Version bump.

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

4 files changed, 48 insertions, 81 deletions

diff --git a/media-video/shrip/ChangeLog b/media-video/shrip/ChangeLog
index d9c28f739e1a..764d68fda3fb 100644
--- a/media-video/shrip/ChangeLog
+++ b/media-video/shrip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/shrip
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/ChangeLog,v 1.6 2009/07/22 21:13:32 gengor Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/ChangeLog,v 1.7 2010/04/26 19:20:11 ssuominen Exp $
+
+*shrip-0.6.0 (26 Apr 2010)
+
+  26 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +shrip-0.6.0.ebuild:
+  Version bump.
 
   22 Jul 2009; Gordon Malm <gengor@gentoo.org> shrip-0.5.0-r1.ebuild:
   Fix bad media-video/ogmrip dependency expression.
diff --git a/media-video/shrip/files/shrip-0.5.0-wur.patch b/media-video/shrip/files/shrip-0.5.0-wur.patch
deleted file mode 100644
index 651067b8d3b4..000000000000
--- a/media-video/shrip/files/shrip-0.5.0-wur.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-r1.ebuild b/media-video/shrip/shrip-0.5.0-r1.ebuild
deleted file mode 100644
index a0c8fe59b12d..000000000000
--- a/media-video/shrip/shrip-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,46 +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/shrip/shrip-0.5.0-r1.ebuild,v 1.2 2009/07/22 21:13:32 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/"
-SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/glib-2.6
-	=media-video/ogmrip-0.12*"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.12.0"
-
-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}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc
-	doins shrip.conf
-}
diff --git a/media-video/shrip/shrip-0.6.0.ebuild b/media-video/shrip/shrip-0.6.0.ebuild
new file mode 100644
index 000000000000..743fda2f9ac9
--- /dev/null
+++ b/media-video/shrip/shrip-0.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/shrip/shrip-0.6.0.ebuild,v 1.1 2010/04/26 19:20:11 ssuominen Exp $
+
+EAPI=2
+
+DESCRIPTION="Command line tool for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
+HOMEPAGE="http://ogmrip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ogmrip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/glib-2.14:2
+	>=media-video/ogmrip-0.13.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( dev-util/intltool
+		sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/CFLAGS/s:-Werror::' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README TODO
+
+	insinto /etc
+	doins shrip.conf || die
+}