Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/vmoconv/, app-mobilephone/vmoconv/files/
Date: Sat, 16 Oct 2021 13:59:10
Message-Id: 1634392715.674083b7896455f1b2334c58d7904ac50b1f0a46.soap@gentoo
1 commit: 674083b7896455f1b2334c58d7904ac50b1f0a46
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 16 13:58:35 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 16 13:58:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674083b7
7
8 app-mobilephone/vmoconv: port to EAPI 8
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 .../vmoconv/files/vmoconv-1.0-flags.patch | 14 +++++++++++---
13 .../vmoconv/files/vmoconv-1.0-glibc28.patch | 12 +++++-------
14 app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild | 20 +++++++++++---------
15 3 files changed, 27 insertions(+), 19 deletions(-)
16
17 diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
18 index 031b6eefaac..c0d14525785 100644
19 --- a/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
20 +++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-flags.patch
21 @@ -1,6 +1,14 @@
22 -diff -Nru vmoconv-1.0.orig/configure.in vmoconv-1.0/configure.in
23 ---- vmoconv-1.0.orig/configure.in 2004-09-26 15:17:48.000000000 +0000
24 -+++ vmoconv-1.0/configure.in 2009-03-03 21:32:40.000000000 +0000
25 +--- a/configure.in
26 ++++ b/configure.in
27 +@@ -2,7 +2,7 @@
28 + # try CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wmissing-prototypes -Werror"
29 + AC_INIT(vmoconv, 1.0, zany@××××.net)
30 + AM_INIT_AUTOMAKE(vmoconv, 1.0)
31 +-AM_CONFIG_HEADER(config.h)
32 ++AC_CONFIG_HEADERS(config.h)
33 +
34 + dnl AM_MAINTAINER_MODE
35 +
36 @@ -26,10 +26,10 @@
37 [printf(__func__)],,
38 [AC_DEFINE(__func__, "", [non-C99 fake support for __func__])])
39
40 diff --git a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
41 index ec957b40c5c..02c000412fb 100644
42 --- a/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
43 +++ b/app-mobilephone/vmoconv/files/vmoconv-1.0-glibc28.patch
44 @@ -1,6 +1,5 @@
45 -diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
46 ---- vmoconv-1.0.orig/src/gsm2vmo.c 2008-06-15 12:57:07.000000000 -0400
47 -+++ vmoconv-1.0/src/gsm2vmo.c 2008-06-15 12:57:36.000000000 -0400
48 +--- a/src/gsm2vmo.c
49 ++++ b/src/gsm2vmo.c
50 @@ -27,7 +27,7 @@
51 * 12 bit header and 260 bits standard GSM frame, as described
52 * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
53 @@ -10,11 +9,10 @@ diff -Naur vmoconv-1.0.orig/src/gsm2vmo.c vmoconv-1.0/src/gsm2vmo.c
54 #include <stdio.h>
55 #include <stdlib.h>
56 #include <string.h>
57 -diff -Naur vmoconv-1.0.orig/src/vmo2gsm.c vmoconv-1.0/src/vmo2gsm.c
58 ---- vmoconv-1.0.orig/src/vmo2gsm.c 2008-06-15 12:57:07.000000000 -0400
59 -+++ vmoconv-1.0/src/vmo2gsm.c 2008-06-15 12:57:36.000000000 -0400
60 +--- a/src/vmo2gsm.c
61 ++++ b/src/vmo2gsm.c
62 @@ -27,7 +27,7 @@
63 - * 12 bit header and 260 bits standard GSM frame, as described
64 + * 12 bit header and 260 bits standart GSM frame, as described
65 * in GSM 06.10 and GSM 06.12. The header is 0x2010 always.
66 */
67 -
68
69 diff --git a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
70 index 6a145ab5804..0e19246d04b 100644
71 --- a/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
72 +++ b/app-mobilephone/vmoconv/vmoconv-1.0-r1.ebuild
73 @@ -1,31 +1,33 @@
74 # Copyright 1999-2021 Gentoo Authors
75 # Distributed under the terms of the GNU General Public License v2
76
77 -EAPI=5
78 +EAPI=8
79
80 -inherit epatch autotools
81 +inherit autotools
82
83 DESCRIPTION="A tool that converts Siemens phones VMO and VMI audio files to gsm and wav"
84 HOMEPAGE="http://triq.net/obex/"
85 SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
86 -LICENSE="GPL-2"
87
88 +LICENSE="GPL-2"
89 SLOT="0"
90 KEYWORDS="amd64 ~ppc x86"
91 -IUSE=""
92
93 DEPEND="media-sound/gsm"
94 RDEPEND="${DEPEND}"
95
96 +PATCHES=(
97 + "${FILESDIR}"/${P}-glibc28.patch
98 + "${FILESDIR}"/${P}-flags.patch
99 + "${FILESDIR}"/${P}-external-libgsm.patch
100 +)
101 +
102 src_prepare() {
103 - epatch "${FILESDIR}/${P}-glibc28.patch"
104 - epatch "${FILESDIR}/${P}-flags.patch"
105 - epatch "${FILESDIR}/${P}-external-libgsm.patch"
106 - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
107 + default
108 eautoreconf
109 }
110
111 src_install() {
112 dobin src/vmo2gsm src/gsm2vmo src/vmo2wav
113 - dodoc AUTHORS ChangeLog NEWS README THANKS
114 + einstalldocs
115 }