1 |
commit: f906491ebc946b144901f0db324801657b0e5ed8 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 2 16:42:57 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 2 16:45:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f906491e |
7 |
|
8 |
media-sound/splay: Remove old ebuild |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
|
12 |
media-sound/splay/files/splay-0.9.5.2-gcc43.patch | 113 ---------------------- |
13 |
media-sound/splay/splay-0.9.5.2.ebuild | 37 ------- |
14 |
2 files changed, 150 deletions(-) |
15 |
|
16 |
diff --git a/media-sound/splay/files/splay-0.9.5.2-gcc43.patch b/media-sound/splay/files/splay-0.9.5.2-gcc43.patch |
17 |
deleted file mode 100644 |
18 |
index 70b9113..00000000 |
19 |
--- a/media-sound/splay/files/splay-0.9.5.2-gcc43.patch |
20 |
+++ /dev/null |
21 |
@@ -1,113 +0,0 @@ |
22 |
-Index: splay-0.9.5.2/apps/splay.cc |
23 |
-=================================================================== |
24 |
---- splay-0.9.5.2.orig/apps/splay.cc |
25 |
-+++ splay-0.9.5.2/apps/splay.cc |
26 |
-@@ -16,14 +16,14 @@ |
27 |
- |
28 |
- #include <sys/types.h> |
29 |
- #include <sys/wait.h> |
30 |
--#include <iostream.h> |
31 |
-+#include <iostream> |
32 |
- |
33 |
- #ifdef HAVE_LIBID3 |
34 |
- #include <id3/tag.h> |
35 |
- #include <id3/misc_support.h> |
36 |
- #endif /* HAVE_LIBID3 */ |
37 |
- |
38 |
--#include <iomanip.h> |
39 |
-+#include <iomanip> |
40 |
- |
41 |
- #include "mpegsound.h" |
42 |
- |
43 |
-@@ -172,7 +172,7 @@ ostream& operator<<(ostream& s, const ID |
44 |
- static void play(char *filename) |
45 |
- { |
46 |
- if( splay_verbose-- ) |
47 |
-- cout << filename << ":" << endl; |
48 |
-+ std::cout << filename << ":" << std::endl; |
49 |
- if( splay_verbose>0 ) |
50 |
- { |
51 |
- // cerr << getpid() << endl; |
52 |
-Index: splay-0.9.5.2/libs/fileplayer.cc |
53 |
-=================================================================== |
54 |
---- splay-0.9.5.2.orig/libs/fileplayer.cc |
55 |
-+++ splay-0.9.5.2/libs/fileplayer.cc |
56 |
-@@ -10,7 +10,7 @@ |
57 |
- #endif |
58 |
- |
59 |
- #include <string.h> |
60 |
--#include <iostream.h> |
61 |
-+#include <iostream> |
62 |
- #include <sys/types.h> |
63 |
- #include <sys/stat.h> |
64 |
- #include <fcntl.h> |
65 |
-@@ -55,7 +55,7 @@ bool Mpegfileplayer::openfile(char *file |
66 |
- fd=open(device, O_WRONLY|O_NDELAY); |
67 |
- } |
68 |
- if ( fd == -1 ) { |
69 |
-- cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << endl; |
70 |
-+ std::cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << std::endl; |
71 |
- return seterrorcode(SOUND_ERROR_DEVOPENFAIL); |
72 |
- } |
73 |
- close(fd); |
74 |
-@@ -121,8 +121,8 @@ bool Mpegfileplayer::playing(int verbose |
75 |
- int totframes=server->gettotalframe(); |
76 |
- double tottime=1.0*totframes*pcmperframe/frequency; |
77 |
- if(frameinfo) { |
78 |
-- cout << "Totalframes " << totframes; |
79 |
-- cout << "; Totaltime " << tominsec(tottime) << endl; |
80 |
-+ std::cout << "Totalframes " << totframes; |
81 |
-+ std::cout << "; Totaltime " << tominsec(tottime) << std::endl; |
82 |
- } |
83 |
- |
84 |
- // Playing |
85 |
-@@ -132,9 +132,9 @@ bool Mpegfileplayer::playing(int verbose |
86 |
- if(frameinfo) { |
87 |
- int currframe=server-> getcurrentframe(); |
88 |
- double currtime=1.0*currframe*pcmperframe/frequency; |
89 |
-- cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
90 |
-- cout << "Time " << tominsec(currtime) << " [" ; |
91 |
-- cout << tominsec(tottime-currtime) << "]" << endl ; |
92 |
-+ std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
93 |
-+ std::cout << "Time " << tominsec(currtime) << " [" ; |
94 |
-+ std::cout << tominsec(tottime-currtime) << "]" << std::endl ; |
95 |
- } |
96 |
- } |
97 |
- |
98 |
-@@ -161,8 +161,8 @@ bool Mpegfileplayer::playingwiththread(i |
99 |
- int totframes=server->gettotalframe(); |
100 |
- double tottime=1.0*totframes*pcmperframe/frequency; |
101 |
- if(frameinfo) { |
102 |
-- cout << "Totalframes " << totframes; |
103 |
-- cout << "; Totaltime " << tominsec(tottime) << endl; |
104 |
-+ std::cout << "Totalframes " << totframes; |
105 |
-+ std::cout << "; Totaltime " << tominsec(tottime) << std::endl; |
106 |
- } |
107 |
- |
108 |
- // Playing |
109 |
-@@ -172,9 +172,9 @@ bool Mpegfileplayer::playingwiththread(i |
110 |
- if(frameinfo) { |
111 |
- int currframe=server-> getcurrentframe(); |
112 |
- double currtime=1.0*currframe*pcmperframe/frequency; |
113 |
-- cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
114 |
-- cout << "Time " << tominsec(currtime) << " [" ; |
115 |
-- cout << tominsec(tottime-currtime) << "]" << endl ; |
116 |
-+ std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; "; |
117 |
-+ std::cout << "Time " << tominsec(currtime) << " [" ; |
118 |
-+ std::cout << tominsec(tottime-currtime) << "]" << std::endl ; |
119 |
- } |
120 |
- } |
121 |
- |
122 |
-Index: splay-0.9.5.2/libs/mpegtoraw.cc |
123 |
-=================================================================== |
124 |
---- splay-0.9.5.2.orig/libs/mpegtoraw.cc |
125 |
-+++ splay-0.9.5.2/libs/mpegtoraw.cc |
126 |
-@@ -552,7 +552,7 @@ int Mpegtoraw::getframesaved(void) |
127 |
- #endif |
128 |
- |
129 |
- |
130 |
--#include <iostream.h> |
131 |
-+#include <iostream> |
132 |
- // Convert mpeg to raw |
133 |
- bool Mpegtoraw::run(int frames) |
134 |
- { |
135 |
|
136 |
diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild |
137 |
deleted file mode 100644 |
138 |
index 23eed98..00000000 |
139 |
--- a/media-sound/splay/splay-0.9.5.2.ebuild |
140 |
+++ /dev/null |
141 |
@@ -1,37 +0,0 @@ |
142 |
-# Copyright 1999-2008 Gentoo Foundation |
143 |
-# Distributed under the terms of the GNU General Public License v2 |
144 |
-# $Id$ |
145 |
- |
146 |
-inherit eutils |
147 |
- |
148 |
-IUSE="" |
149 |
- |
150 |
-DESCRIPTION="an audio player, primarily for the console" |
151 |
-HOMEPAGE="http://splay.sourceforge.net/" |
152 |
-SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz" |
153 |
- |
154 |
-LICENSE="GPL-2" |
155 |
-SLOT="0" |
156 |
-KEYWORDS="amd64 ~ppc x86" |
157 |
- |
158 |
-src_unpack() { |
159 |
- unpack ${A} |
160 |
- epatch "${FILESDIR}/${P}-gcc43.patch" |
161 |
- cd "${S}/apps" |
162 |
- epatch "${FILESDIR}/${P}-external-id3lib.diff" |
163 |
- epatch "${FILESDIR}/${P}-gcc43-2.patch" |
164 |
-} |
165 |
- |
166 |
-src_compile() { |
167 |
- # Force compilation to omit X support according to BUG #5856 |
168 |
- # even when qt is present on the system. |
169 |
- export ac_cv_lib_qt_main=no |
170 |
- econf || die "econf failed" |
171 |
- emake || die "emake failed" |
172 |
-} |
173 |
- |
174 |
-src_install() { |
175 |
- # Specify man-page to prevent xsplay.1 from being installed |
176 |
- einstall man_MANS=splay.1 || die "einstall failed" |
177 |
- dodoc AUTHORS ChangeLog README README.LIB NEWS |
178 |
-} |