gentoo resync : 02.06.2018

6 files changed, 24 insertions, 29 deletions

diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index d828f3355b6e..1ba4c5bfdd86 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -1,7 +1,7 @@
-AUX ogmtools-1.5-comments.patch 1028 BLAKE2B de7d80d0683b9065ec6d9a2d786cbdb0789e6dde39e7bc715f30b93a167a458bcb8670b1c5fbce6f1884959781e70ea34afb069d7301b83852e695243697a2aa SHA512 65aac830c44f73ce68eccfcd9e1d1616f62e5b340b2335c75b7363a99a94ae62b9b7d23a0e06de103dc7ea054373191e0fbfc6cfe06df3e03961bf7cc91c75d9
-AUX ogmtools-1.5-endian-fix.patch 406 BLAKE2B 212020a52a4de97fc95665752ed4f2b829aac6a7ec5729d9090da317b810d5ec20874ce7680e579b5b494cb17edb9a833ddf061e33066c207b93f3dd1c92c76f SHA512 eeefe3bca9d39486a090a2735badc3996f087488d8b2e4121479efc247b9bfe53148f2ef60d95031fc0e0452e891d9ff6c3715bcf0e833266c946ac22b71d934
-AUX ogmtools-1.5-summary_length.patch 489 BLAKE2B a5fae26d83882035e5d204ef67b5adce67866f205185b6e9638e9f8dd02c580cbf639e4e9e6a44547cbba72cb01f5bb02a370e1b201442cfc234dd6882c319bc SHA512 ddbde11040a9426455fa91fa5c92ce4d729da91b661014b7abdb25614d3108c2f32321bf738fb984c6869a6ffcddb651541dbdd53446cb33cb9c5dc902cd6c99
-AUX ogmtools-1.5-vorbis_verbosity.patch 524 BLAKE2B 851b955376a81580ce52e90f795c5688437c7a9ccbaaa1ce6c761b02d8767843ca85c25ebcd54eb462529727fe0aa21a369ebefcd100fa7e609b337539ee39a0 SHA512 5f3b1a76aa6f414ebd29805f1a986e7050879a72610518f35025b783985d3eaa5157be7e1084541cc52dc5ad2f380ef3395d7ebaf33c73098f0844d8e0822146
+AUX ogmtools-1.5-comments.patch 977 BLAKE2B d12a056f8e6773737e612076bbda53b8c50912f99c7d1649d762c6d8c3c81a8f7fc9230b46e74724a03046a7367ad2331d755e1a2db19d665f2055d33d29d2df SHA512 345ca99a0685df2c9904e182c6046a367541d07f0eff8a7667650557d1729059dcd995320c7ffd40e5c52bdd7fa0ab648a53e85fb0f8a7628753dd5a2c4d027a
+AUX ogmtools-1.5-endian-fix.patch 333 BLAKE2B c1d544bc210eeb464467b7a324f048af234986e4d52573f6d9ed060fd8f6d2aaa96d7a6868a10caf2e1c895db38f6deadb4bd605a5d5920f0e052b4f781d5959 SHA512 a2de28d2063227c6f9d4e8ca2d5d10210f5bd72c1cf02087cd4d437fe211095ff8035320c75f23221cbfb11ade6bdfaa20e27fc09fbaeee26dcd2dc0d1239221
+AUX ogmtools-1.5-summary_length.patch 330 BLAKE2B b59fa0606b2a1bf60c355c4d2ecb2ee58c6f5419aee1471cd27bbbf365bad32d123f57c6f40deb02139a453efca50daa15f255ec56173e9e49803f434c56f063 SHA512 00212dd740d2de3702b717089949ae6961c0faeffe857bef61f1b3f019b8fc88c510302f5802d28d88d07e051d6859612a46b06f603cfbeb3a72afca565e5cae
+AUX ogmtools-1.5-vorbis_verbosity.patch 365 BLAKE2B 57b1ca8a076f8ccc5a09e77a869e784fd7dfc79240b9b14315918d95fab45cc91ce92f8a8914d5c7efdad9981389f4c1e4f41f61bb55ec4507b120159fcda549 SHA512 8d5fe06c22404198f3956c18bf91c986d212fda1987f33b8c247f6af8cd7f3ab690c105278d0f1ba188130bcfdf8dca3659a9da1c42fe19fac0692e7a853064e
 DIST ogmtools-1.5.tar.bz2 214934 BLAKE2B d9d3aa3afe0a64a6dd8201c030120a2ec9cc752037c48c1ff58b3334a5006bbd5974ff2eacb4c7e8a17c722f8fbc5ac033a64840edb179da9d66bda6743eb71d SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee
-EBUILD ogmtools-1.5-r2.ebuild 921 BLAKE2B a4bd0a2e31729bc854bf7fd07f5118d5e16b19075693c0a33f1fe003be34c3f56d218d7fc4fe7ea3668826047b64c2af66dd16e5316b32deb809aeceda57317e SHA512 9f677033ba90ca407081ea7264754289efb5d2fbd3a3ec65fdac51458a083555ed374fe3b8c1716a0fe41c29b54081788b7336e78dc5c96478d5222dda545339
+EBUILD ogmtools-1.5-r2.ebuild 813 BLAKE2B d74853852e5c94afcc1c8c6dda27b43e838d9e792729c4f44ffb0cdfe60d7177ffa0a29ae0f30fa9198f324110e76aba63086fb2c34cc2b99e845e1dee351d04 SHA512 f3cbce5dcd9eebbc5286b54b69567cc88d4f0786a29f88b723ce7d8614100d543dca0abd4ead68038108e284c4835e4c7b38de069c5eaa89b0adc20fecfd899c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
index 0440a8040b8c..c331baa8b906 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 8945ca47c082..0c8758027a00 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 8457918beb8f..00c2ee06c6b9 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 085cc5d978d3..5b71402649eb 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 8e6971a61fc0..2615313a813f 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,10 @@ 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"
-	fi
+	use dvd && dobin dvdxchap
 
-	dodoc ChangeLog README TODO
+	einstalldocs
 	doman *.1
 }