Revision bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 75 insertions, 2 deletions

diff --git a/media-sound/ogmtools/ChangeLog b/media-sound/ogmtools/ChangeLog
index 0b82a2bfd7f7..d02f1033aee1 100644
--- a/media-sound/ogmtools/ChangeLog
+++ b/media-sound/ogmtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/ogmtools
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.29 2007/11/09 15:10:59 beandog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ChangeLog,v 1.30 2009/05/12 09:49:32 ssuominen Exp $
+
+*ogmtools-1.5-r2 (12 May 2009)
+
+  12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +ogmtools-1.5-r2.ebuild, +files/ogmtools-1.5-summary_length.patch,
+  +files/ogmtools-1.5-vorbis_verbosity.patch:
+  Fix of wrong length reporting, should close 173839. When using -v 
+  and -s together, the verbose output is removed.
 
 *ogmtools-1.5-r1 (09 Nov 2007)
 
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
new file mode 100644
index 000000000000..8457918beb8f
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
@@ -0,0 +1,12 @@
+diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
+--- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
++++ ogmtools-1.5/ogminfo.c	2009-05-12 12:41:58.000000000 +0300
+@@ -513,7 +513,7 @@
+               stream->serial, stream->size,
+               (stream->size * 8.0 / 1000.0) / now,
+               (stream->size / 1024.0) / now,
+-              stream->num_packets, now * 1000.0);
++              stream->num_packets, now);
+       stream = stream->next;
+     }
+   }
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
new file mode 100644
index 000000000000..085cc5d978d3
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
@@ -0,0 +1,12 @@
+diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
+--- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
++++ ogmtools-1.5/ogminfo.c	2009-05-12 12:42:56.000000000 +0300
+@@ -188,7 +188,7 @@
+     }
+     vorbis_comment_clear(&vc);
+   } else if ((stream->stype == 'a') && stream->vorbis) {
+-    if (verbose < 1)
++    if (verbose < 2)
+       return;
+     fprintf(stdout, "(%s) a%d: % 7ld bytes granulepos: % 10lld pno: % 10lld ",
+              __FILE__, stream->sno, pack->bytes, ogg_page_granulepos(page),
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
new file mode 100644
index 000000000000..827cb63b2c23
--- /dev/null
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ogmtools/ogmtools-1.5-r2.ebuild,v 1.1 2009/05/12 09:49:32 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="These tools allow information about (ogminfo) or extraction from (ogmdemux) or creation of (ogmmerge) OGG media streams"
+HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
+SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dvd"
+
+RDEPEND="dvd? ( media-libs/libdvdread )
+	media-sound/vorbis-tools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-comments.patch \
+		"${FILESDIR}"/${P}-endian-fix.patch \
+		"${FILESDIR}"/${P}-vorbis_verbosity.patch \
+		"${FILESDIR}"/${P}-summary_length.patch
+}
+
+src_configure() {
+	econf $(use_with dvd dvdread)
+}
+
+src_install() {
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed"
+
+	if use dvd; then
+		dobin dvdxchap || die "dobin failed"
+	fi
+
+	dodoc ChangeLog README TODO
+	doman *.1
+}