Revision bump.

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

5 files changed, 79 insertions, 3 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/Manifest b/media-sound/ogmtools/Manifest
index c6216966b33b..c27d13d17910 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,7 +1,10 @@
 AUX ogmtools-1.5-comments.patch 1028 RMD160 03a141539ec280bb4322458b7bcad202775d1fc6 SHA1 1cd30c716c8c9b8b01ef2337e6dcf4d76db61565 SHA256 f6eb56592d5456dcfc60c01115f2fd59b54addfdf48348c1230f6c89ce9880b9
 AUX ogmtools-1.5-endian-fix.patch 406 RMD160 f3731c5d77d02c084db23fe9b0415c88d7b1b9a5 SHA1 708e235ca129f33a96ccff9c74343fee4d242f96 SHA256 a2c7f6d5a8a532e55c8655f3f26dab3f4aab3310fb4a8ed4c6fc2eaa126b0052
+AUX ogmtools-1.5-summary_length.patch 489 RMD160 7bfa3eb3d5a6414014d8a6212a0255ab23877fcf SHA1 03ef89dff95910194e9e5582299dcb3a02e23d3a SHA256 33fa479ce314ee61d8c14c86624f2c51f4b2601987814efa22564606a46c007e
+AUX ogmtools-1.5-vorbis_verbosity.patch 524 RMD160 c198bdbd1acaf048ae22ffa7a98e17822f73984c SHA1 d1a59d7e3e28fb0e5708aa65ec8bbcacb54db404 SHA256 4067a23b45666c2943e2e24c7294590f5e816265d92f7e77b71e448762edaf2d
 DIST ogmtools-1.5.tar.bz2 214934 RMD160 58b917795fcc08904d6dfdcfb6be82d1cd8cb4ca SHA1 a23ba7e6ac490ffb60e8fb739e790b7a020a444c SHA256 c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea
 EBUILD ogmtools-1.5-r1.ebuild 1091 RMD160 557e03baf3cf04cfbdb30e6d53483f3a726b4c71 SHA1 29c680a69930b73eb14b814a0bcdca702e9eaeed SHA256 78fa7432487dd6d3ecf7af4339e902f03bef5ac152d7efcd310d056485579975
+EBUILD ogmtools-1.5-r2.ebuild 1105 RMD160 8c9e95a11f3987a1a732a91cb7baa528afaabe30 SHA1 e25dd6de10772c6cc5abd2445020ea9ea04f0ae9 SHA256 ca1665ee7c5ca78d0be5a3dc79f53154f1ec779afbe7ed881d0afc1be7a792a0
 EBUILD ogmtools-1.5.ebuild 1039 RMD160 f6f59fdea76818a1a8007f2821115c79d34889f5 SHA1 47485de94024a4aec56de1ba1e5adf6fd4719443 SHA256 96cac208728c74ceeb341ab23e5fe437cef8d35a45f5d8dca698ff2e9cb49130
-MISC ChangeLog 3832 RMD160 42ab3e3c3bfdbbb512d4f8e2d63d83e7c927912f SHA1 8b5ed08a313799efb0c388892fffb644534f270e SHA256 20e17b931af64fe94386f5c6fe3fd8cb0d3c27b38a5ca4cfe1fd2fbaf5ddd40d
+MISC ChangeLog 4155 RMD160 d7a4c1e4f95b9155a70cf57d86c884cb92682166 SHA1 a245322c6502d5da40f6dbd9cec844aa4c0fb354 SHA256 3ad60516105f66136d456fb96ad44cbc2ac9822fbb7c3c94b0f47d924fc4cd03
 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e
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
+}