[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/, media-sound/ogmtools/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/ogmtools/, media-sound/ogmtools/files/

[Aaron Bauman]

commit:     c97c4196d1afa73e3c48743ebf59c36761821c20
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 21:30:53 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed May 30 00:27:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97c4196

media-sound/ogmtools: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../ogmtools/files/ogmtools-1.5-comments.patch     |  4 ++--
 .../ogmtools/files/ogmtools-1.5-endian-fix.patch   |  4 ++--
 .../files/ogmtools-1.5-summary_length.patch        |  5 ++---
 .../files/ogmtools-1.5-vorbis_verbosity.patch      |  5 ++---
 media-sound/ogmtools/ogmtools-1.5-r2.ebuild        | 23 +++++++++++-----------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
index 0440a8040b8..c331baa8b90 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
@@ -1,5 +1,5 @@
---- vorbis_header_utils.c.orig	Fri Aug 31 14:47:55 2007
-+++ vorbis_header_utils.c	Fri Aug 31 14:51:23 2007
+--- a/vorbis_header_utils.c
++++ b/vorbis_header_utils.c
 @@ -153,15 +153,15 @@
      die("malloc");
    

diff --git a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
index 8945ca47c08..0c8758027a0 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
@@ -1,5 +1,5 @@
---- avilib/avidump.c.orig	2004-11-02 15:30:16.000000000 +0000
-+++ avilib/avidump.c	2004-11-17 19:12:02.730255128 +0000
+--- a/avilib/avidump.c
++++ b/avilib/avidump.c
 @@ -54,7 +54,7 @@
                     ((x<<8)  & 0x00ff0000) |\
                     ((x<<24) & 0xff000000))

diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
index 8457918beb8..00c2ee06c6b 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
@@ -1,6 +1,5 @@
-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
+--- a/ogminfo.c
++++ b/ogminfo.c
 @@ -513,7 +513,7 @@
                stream->serial, stream->size,
                (stream->size * 8.0 / 1000.0) / now,

diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
index 085cc5d978d..5b71402649e 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
@@ -1,6 +1,5 @@
-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
+--- a/ogminfo.c
++++ b/ogminfo.c
 @@ -188,7 +188,7 @@
      }
      vorbis_comment_clear(&vc);

diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 8e6971a61fc..2abca8c77f1 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Information, extraction or creation for OGG media streams"
 HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
@@ -17,12 +16,12 @@ 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
-}
+PATCHES=(
+	"${FILESDIR}/${P}-comments.patch"
+	"${FILESDIR}/${P}-endian-fix.patch"
+	"${FILESDIR}/${P}-vorbis_verbosity.patch"
+	"${FILESDIR}/${P}-summary_length.patch"
+)
 
 src_configure() {
 	econf \
@@ -30,12 +29,12 @@ src_configure() {
 }
 
 src_install() {
-	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed"
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat
 
 	if use dvd; then
-		dobin dvdxchap || die "dobin failed"
+		dobin dvdxchap
 	fi
 
-	dodoc ChangeLog README TODO
+	einstalldocs ChangeLog README TODO
 	doman *.1
 }