1 |
commit: c97c4196d1afa73e3c48743ebf59c36761821c20 |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 21:30:53 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 30 00:27:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97c4196 |
7 |
|
8 |
media-sound/ogmtools: bump EAPI and drop eutils |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
.../ogmtools/files/ogmtools-1.5-comments.patch | 4 ++-- |
13 |
.../ogmtools/files/ogmtools-1.5-endian-fix.patch | 4 ++-- |
14 |
.../files/ogmtools-1.5-summary_length.patch | 5 ++--- |
15 |
.../files/ogmtools-1.5-vorbis_verbosity.patch | 5 ++--- |
16 |
media-sound/ogmtools/ogmtools-1.5-r2.ebuild | 23 +++++++++++----------- |
17 |
5 files changed, 19 insertions(+), 22 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch |
20 |
index 0440a8040b8..c331baa8b90 100644 |
21 |
--- a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch |
22 |
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch |
23 |
@@ -1,5 +1,5 @@ |
24 |
---- vorbis_header_utils.c.orig Fri Aug 31 14:47:55 2007 |
25 |
-+++ vorbis_header_utils.c Fri Aug 31 14:51:23 2007 |
26 |
+--- a/vorbis_header_utils.c |
27 |
++++ b/vorbis_header_utils.c |
28 |
@@ -153,15 +153,15 @@ |
29 |
die("malloc"); |
30 |
|
31 |
|
32 |
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch |
33 |
index 8945ca47c08..0c8758027a0 100644 |
34 |
--- a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch |
35 |
+++ b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch |
36 |
@@ -1,5 +1,5 @@ |
37 |
---- avilib/avidump.c.orig 2004-11-02 15:30:16.000000000 +0000 |
38 |
-+++ avilib/avidump.c 2004-11-17 19:12:02.730255128 +0000 |
39 |
+--- a/avilib/avidump.c |
40 |
++++ b/avilib/avidump.c |
41 |
@@ -54,7 +54,7 @@ |
42 |
((x<<8) & 0x00ff0000) |\ |
43 |
((x<<24) & 0xff000000)) |
44 |
|
45 |
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch |
46 |
index 8457918beb8..00c2ee06c6b 100644 |
47 |
--- a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch |
48 |
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch |
49 |
@@ -1,6 +1,5 @@ |
50 |
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c |
51 |
---- ogmtools-1.5.orig/ogminfo.c 2003-11-21 00:21:36.000000000 +0200 |
52 |
-+++ ogmtools-1.5/ogminfo.c 2009-05-12 12:41:58.000000000 +0300 |
53 |
+--- a/ogminfo.c |
54 |
++++ b/ogminfo.c |
55 |
@@ -513,7 +513,7 @@ |
56 |
stream->serial, stream->size, |
57 |
(stream->size * 8.0 / 1000.0) / now, |
58 |
|
59 |
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch |
60 |
index 085cc5d978d..5b71402649e 100644 |
61 |
--- a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch |
62 |
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch |
63 |
@@ -1,6 +1,5 @@ |
64 |
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c |
65 |
---- ogmtools-1.5.orig/ogminfo.c 2003-11-21 00:21:36.000000000 +0200 |
66 |
-+++ ogmtools-1.5/ogminfo.c 2009-05-12 12:42:56.000000000 +0300 |
67 |
+--- a/ogminfo.c |
68 |
++++ b/ogminfo.c |
69 |
@@ -188,7 +188,7 @@ |
70 |
} |
71 |
vorbis_comment_clear(&vc); |
72 |
|
73 |
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild |
74 |
index 8e6971a61fc..2abca8c77f1 100644 |
75 |
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild |
76 |
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild |
77 |
@@ -1,8 +1,7 @@ |
78 |
-# Copyright 1999-2009 Gentoo Foundation |
79 |
+# Copyright 1999-2018 Gentoo Foundation |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
|
82 |
-EAPI=2 |
83 |
-inherit eutils |
84 |
+EAPI=6 |
85 |
|
86 |
DESCRIPTION="Information, extraction or creation for OGG media streams" |
87 |
HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/" |
88 |
@@ -17,12 +16,12 @@ RDEPEND="dvd? ( media-libs/libdvdread ) |
89 |
media-sound/vorbis-tools" |
90 |
DEPEND="${RDEPEND}" |
91 |
|
92 |
-src_prepare() { |
93 |
- epatch "${FILESDIR}"/${P}-comments.patch \ |
94 |
- "${FILESDIR}"/${P}-endian-fix.patch \ |
95 |
- "${FILESDIR}"/${P}-vorbis_verbosity.patch \ |
96 |
- "${FILESDIR}"/${P}-summary_length.patch |
97 |
-} |
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}/${P}-comments.patch" |
100 |
+ "${FILESDIR}/${P}-endian-fix.patch" |
101 |
+ "${FILESDIR}/${P}-vorbis_verbosity.patch" |
102 |
+ "${FILESDIR}/${P}-summary_length.patch" |
103 |
+) |
104 |
|
105 |
src_configure() { |
106 |
econf \ |
107 |
@@ -30,12 +29,12 @@ src_configure() { |
108 |
} |
109 |
|
110 |
src_install() { |
111 |
- dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed" |
112 |
+ dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat |
113 |
|
114 |
if use dvd; then |
115 |
- dobin dvdxchap || die "dobin failed" |
116 |
+ dobin dvdxchap |
117 |
fi |
118 |
|
119 |
- dodoc ChangeLog README TODO |
120 |
+ einstalldocs ChangeLog README TODO |
121 |
doman *.1 |
122 |
} |