Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/grip/files/, media-sound/grip/
Date: Sun, 04 Feb 2018 06:31:15
Message-Id: 1517725851.29aef7cf9f081dce8c251f828ca13a0c7479047d.polynomial-c@gentoo
1 commit: 29aef7cf9f081dce8c251f828ca13a0c7479047d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 4 06:30:28 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 4 06:30:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29aef7cf
7
8 media-sound/grip: Removed old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 media-sound/grip/Manifest | 2 -
13 .../files/grip-3.3.1-implicit-declaration.patch | 32 -------------
14 .../grip/files/grip-3.3.1-invalid-genre-size.patch | 30 -------------
15 media-sound/grip/grip-3.3.1-r3.ebuild | 52 ----------------------
16 media-sound/grip/grip-3.6.1.ebuild | 52 ----------------------
17 5 files changed, 168 deletions(-)
18
19 diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
20 index c2c8bef76ca..16dd05b9c64 100644
21 --- a/media-sound/grip/Manifest
22 +++ b/media-sound/grip/Manifest
23 @@ -1,6 +1,4 @@
24 -DIST grip-3.3.1.tar.gz 812562 BLAKE2B 7aa7cdb0d9c4b60d42e5af108299923466f69df1b14ecbe06b1b56b7a8719e12389c90d1478328c5e05f14cb65f7da23486c8467a7707bee35f33fa51e8e40ea SHA512 380e36cb4e58180e543e1d293d38108f4879842ed63106da875e00747e98c2c06da1e706cfaf4ff26f481bba0ca941eb1201f430de04b0f313b1307ddd7e88d3
25 DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
26 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
27 -DIST grip-3.6.1.tar.gz 958967 BLAKE2B 2355312f26bb1bf503dedf0bea07e7a0ea1ede1a90cfa215188a4c0396c2b50315ff8e6579c66a5d1284622f80022a5b6681559a169fe2eff21e1f3226466799 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf
28 DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8
29 DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d
30
31 diff --git a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch b/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch
32 deleted file mode 100644
33 index 2319b772a9b..00000000000
34 --- a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch
35 +++ /dev/null
36 @@ -1,32 +0,0 @@
37 ---- grip-3.3.1/src/status_window.c
38 -+++ grip-3.3.1/src/status_window.c
39 -@@ -23,6 +23,7 @@
40 - #include <stdlib.h>
41 - #include <stdio.h>
42 - #include <unistd.h>
43 -+#include <string.h>
44 - #include <fcntl.h>
45 - #include <vte/vte.h>
46 - #include "status_window.h"
47 ---- grip-3.3.1/src/tray.c
48 -+++ grip-3.3.1/src/tray.c
49 -@@ -20,6 +20,9 @@
50 - * USA
51 - */
52 -
53 -+#include "cdplay.h"
54 -+#include "common.h"
55 -+#include "rip.h"
56 - #include "tray.h"
57 - #include "../pixmaps/rip1.xpm"
58 - #include "../pixmaps/menuplay.xpm"
59 ---- grip-3.3.1/src/cdplay.c
60 -+++ grip-3.3.1/src/cdplay.c
61 -@@ -28,6 +28,7 @@
62 - #include "cddev.h"
63 - #include "discedit.h"
64 - #include "dialog.h"
65 -+#include "tray.h"
66 - #include "rip.h"
67 - #include "grip_id3.h"
68 -
69
70 diff --git a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch b/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch
71 deleted file mode 100644
72 index c826fc6e2e8..00000000000
73 --- a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch
74 +++ /dev/null
75 @@ -1,30 +0,0 @@
76 -http://bugs.gentoo.org/285105
77 -
78 ---- grip-3.3.1/src/id3.c
79 -+++ grip-3.3.1/src/id3.c
80 -@@ -252,8 +252,8 @@
81 -
82 - if ( frames[ i ] ) {
83 - char *c_data = NULL;
84 -- char gen[ 5 ] = "( )";
85 -- char trk[ 4 ] = " ";
86 -+ char gen[ 6 ] = "( )"; /* max unsigned char: 255 */
87 -+ char trk[ 3 ] = " "; /* max CDDA tracks: 99 */
88 -
89 - switch( frameids[ i ] ) {
90 - case ID3FID_TITLE:
91 -@@ -278,12 +278,12 @@
92 -
93 - case ID3FID_CONTENTTYPE:
94 - c_data = gen;
95 -- sprintf( gen, "(%d)", genre ); /* XXX */
96 -+ snprintf( gen, 6, "(%d)", genre );
97 - break;
98 -
99 - case ID3FID_TRACKNUM:
100 - c_data = trk;
101 -- sprintf( trk, "%d", tracknum ); /* XXX */
102 -+ snprintf( trk, 3, "%d", tracknum );
103 - break;
104 -
105 - default:
106
107 diff --git a/media-sound/grip/grip-3.3.1-r3.ebuild b/media-sound/grip/grip-3.3.1-r3.ebuild
108 deleted file mode 100644
109 index 9c72bbab774..00000000000
110 --- a/media-sound/grip/grip-3.3.1-r3.ebuild
111 +++ /dev/null
112 @@ -1,52 +0,0 @@
113 -# Copyright 1999-2012 Gentoo Foundation
114 -# Distributed under the terms of the GNU General Public License v2
115 -
116 -EAPI=2
117 -inherit eutils flag-o-matic toolchain-funcs libtool
118 -
119 -DESCRIPTION="GTK+ based Audio CD Player/Ripper"
120 -HOMEPAGE="https://sourceforge.net/projects/grip/"
121 -SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
122 -
123 -LICENSE="GPL-2"
124 -SLOT="0"
125 -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
126 -IUSE="nls vorbis"
127 -
128 -RDEPEND=">=x11-libs/gtk+-2.2:2
129 - x11-libs/vte:0
130 - media-sound/lame
131 - media-sound/cdparanoia
132 - >=media-libs/id3lib-3.8.3
133 - >=gnome-base/libgnomeui-2.2.0
134 - >=gnome-base/orbit-2
135 - net-misc/curl
136 - vorbis? ( media-sound/vorbis-tools )"
137 -# gnome-extra/yelp, see bug 416843
138 -DEPEND="${RDEPEND}
139 - virtual/pkgconfig
140 - nls? ( sys-devel/gettext )"
141 -
142 -src_prepare() {
143 - epatch "${FILESDIR}"/${P}-implicit-declaration.patch
144 - epatch "${FILESDIR}"/${P}-invalid-genre-size.patch #285105
145 - # fix include syntax for newer versions of bash
146 - sed -i '/[.] conftest[.]id3/s: c: ./c:' configure || die
147 - elibtoolize
148 -}
149 -
150 -src_configure() {
151 - # Bug #69536
152 - [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
153 -
154 - strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nl pl_PL pt_BR ru zh_CN zh_HK zh_TW
155 -
156 - econf \
157 - --disable-dependency-tracking \
158 - $(use_enable nls)
159 -}
160 -
161 -src_install () {
162 - emake DESTDIR="${D}" install || die
163 - dodoc AUTHORS CREDITS ChangeLog README TODO
164 -}
165
166 diff --git a/media-sound/grip/grip-3.6.1.ebuild b/media-sound/grip/grip-3.6.1.ebuild
167 deleted file mode 100644
168 index 5f755547265..00000000000
169 --- a/media-sound/grip/grip-3.6.1.ebuild
170 +++ /dev/null
171 @@ -1,52 +0,0 @@
172 -# Copyright 1999-2017 Gentoo Foundation
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=6
176 -inherit eutils flag-o-matic toolchain-funcs libtool
177 -
178 -DESCRIPTION="GTK+ based Audio CD Player/Ripper"
179 -HOMEPAGE="https://sourceforge.net/projects/grip/"
180 -SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
181 -
182 -LICENSE="GPL-2"
183 -SLOT="0"
184 -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
185 -IUSE="vorbis"
186 -
187 -# lame and vorbis-tools are no real RDEPENDs. But without them
188 -# grip cannot convert ripped files to any format. So use them as
189 -# a sane default.
190 -RDEPEND="
191 - gnome-base/libgnome
192 - >=gnome-base/libgnomeui-2.2.0
193 - >=media-libs/id3lib-3.8.3
194 - media-sound/cdparanoia
195 - media-sound/lame
196 - net-misc/curl
197 - >=x11-libs/gtk+-2.2:2
198 - x11-libs/libX11
199 - x11-libs/pango
200 - x11-libs/vte:0
201 - vorbis? ( media-sound/vorbis-tools )
202 -"
203 -# gnome-extra/yelp, see bug 416843
204 -DEPEND="
205 - ${RDEPEND}
206 - sys-devel/gettext
207 - virtual/pkgconfig
208 -"
209 -
210 -src_prepare() {
211 - default
212 -
213 - sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
214 -}
215 -
216 -src_configure() {
217 - # Bug #69536
218 - [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
219 -
220 - strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
221 -
222 - econf
223 -}