[gentoo-commits] repo/gentoo:master commit in: media-sound/cmus/ - gentoo-commits

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-sound/cmus/
Date:	Sun, 09 Feb 2020 20:11:45
Message-Id:	`1581279087.7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8.asturm@gentoo`

1

commit:     7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8

2

Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

3

AuthorDate: Sun Feb  9 20:08:05 2020 +0000

4

Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

5

CommitDate: Sun Feb  9 20:11:27 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7677b6cf

7

8

media-sound/cmus: Drop USE cue

9

10

Closes: https://bugs.gentoo.org/700122

11

Package-Manager: Portage-2.3.88, Repoman-2.3.20

12

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

13

14

 media-sound/cmus/cmus-2.8.0.ebuild | 34 ++++++++++++++++++++--------------

15

 media-sound/cmus/cmus-9999.ebuild  | 34 ++++++++++++++++++++--------------

16

 media-sound/cmus/metadata.xml      |  1 -

17

 3 files changed, 40 insertions(+), 29 deletions(-)

18

19

diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild

20

index 83c05f7dc5e..e4cfd45303e 100644

21

--- a/media-sound/cmus/cmus-2.8.0.ebuild

22

+++ b/media-sound/cmus/cmus-2.8.0.ebuild

23

@@ -1,4 +1,4 @@

24

-# Copyright 1999-2019 Gentoo Authors

25

+# Copyright 1999-2020 Gentoo Authors

26

 # Distributed under the terms of the GNU General Public License v2

27

28

 EAPI=7

29

@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"

30

31

 LICENSE="GPL-2"

32

 SLOT="0"

33

-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate

34

+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate

35

 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode

36

 	+vorbis wavpack"

37

38

@@ -34,7 +34,6 @@ DEPEND="

39

 	ao? ( media-libs/libao )

40

 	cddb? ( media-libs/libcddb )

41

 	cdio? ( dev-libs/libcdio-paranoia )

42

-	cue? ( media-libs/libcue )

43

 	discid? ( media-libs/libdiscid )

44

 	elogind? ( sys-auth/elogind )

45

 	ffmpeg? ( media-video/ffmpeg:= )

46

@@ -74,16 +73,24 @@ PATCHES=(

47

48

 S="${WORKDIR}/${P/_/-}"

49

50

-my_config() {

51

-	local value

52

-	use ${1} && value=a || value=n

53

-	myconf="${myconf} ${2}=${value}"

54

-}

55

-

56

 src_configure() {

57

-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"

58

+	my_config() {

59

+		local value

60

+		use ${1} && value=a || value=n

61

+		myconf+=( ${2}=${value} )

62

+	}

63

64

+	local debuglevel=1

65

 	use debug && debuglevel=2

66

+	local myconf=(

67

+		CONFIG_CUE=y

68

+		CONFIG_ARTS=n

69

+		CONFIG_SUN=n

70

+		CONFIG_SNDIO=n

71

+		CONFIG_WAVEOUT=n

72

+		CONFIG_VTX=n

73

+		CONFIG_ROAR=n

74

+	)

75

76

 	my_config cddb CONFIG_CDDB

77

 	my_config cdio CONFIG_CDIO

78

@@ -100,7 +107,6 @@ src_configure() {

79

 	my_config mp4 CONFIG_MP4

80

 	my_config aac CONFIG_AAC

81

 	my_config ffmpeg CONFIG_FFMPEG

82

-	my_config cue CONFIG_CUE

83

 	my_config pulseaudio CONFIG_PULSE

84

 	my_config alsa CONFIG_ALSA

85

 	my_config jack CONFIG_JACK

86

@@ -109,12 +115,12 @@ src_configure() {

87

 	my_config oss CONFIG_OSS

88

89

 	if use elogind || use systemd; then

90

-		myconf="${myconf} CONFIG_MPRIS=a"

91

+		myconf+=( CONFIG_MPRIS=a )

92

 	else

93

-		myconf="${myconf} CONFIG_MPRIS=n"

94

+		myconf+=( CONFIG_MPRIS=n )

95

fi

96

97

-	./configure prefix="${EPREFIX}"/usr ${myconf} \

98

+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \

99

 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \

100

 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die

101

}

102

103

diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild

104

index 6ae109af57a..283dda19519 100644

105

--- a/media-sound/cmus/cmus-9999.ebuild

106

+++ b/media-sound/cmus/cmus-9999.ebuild

107

@@ -1,4 +1,4 @@

108

-# Copyright 1999-2019 Gentoo Authors

109

+# Copyright 1999-2020 Gentoo Authors

110

 # Distributed under the terms of the GNU General Public License v2

111

112

 EAPI=7

113

@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"

114

115

 LICENSE="GPL-2"

116

 SLOT="0"

117

-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate

118

+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate

119

 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode

120

 	+vorbis wavpack"

121

122

@@ -34,7 +34,6 @@ DEPEND="

123

 	ao? ( media-libs/libao )

124

 	cddb? ( media-libs/libcddb )

125

 	cdio? ( dev-libs/libcdio-paranoia )

126

-	cue? ( media-libs/libcue )

127

 	discid? ( media-libs/libdiscid )

128

 	elogind? ( sys-auth/elogind )

129

 	ffmpeg? ( media-video/ffmpeg:= )

130

@@ -68,16 +67,24 @@ DOCS=( AUTHORS README.md )

131

132

 S="${WORKDIR}/${P/_/-}"

133

134

-my_config() {

135

-	local value

136

-	use ${1} && value=a || value=n

137

-	myconf="${myconf} ${2}=${value}"

138

-}

139

-

140

 src_configure() {

141

-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"

142

+	my_config() {

143

+		local value

144

+		use ${1} && value=a || value=n

145

+		myconf+=( ${2}=${value} )

146

+	}

147

148

+	local debuglevel=1

149

 	use debug && debuglevel=2

150

+	local myconf=(

151

+		CONFIG_CUE=y

152

+		CONFIG_ARTS=n

153

+		CONFIG_SUN=n

154

+		CONFIG_SNDIO=n

155

+		CONFIG_WAVEOUT=n

156

+		CONFIG_VTX=n

157

+		CONFIG_ROAR=n

158

+	)

159

160

 	my_config cddb CONFIG_CDDB

161

 	my_config cdio CONFIG_CDIO

162

@@ -94,7 +101,6 @@ src_configure() {

163

 	my_config mp4 CONFIG_MP4

164

 	my_config aac CONFIG_AAC

165

 	my_config ffmpeg CONFIG_FFMPEG

166

-	my_config cue CONFIG_CUE

167

 	my_config pulseaudio CONFIG_PULSE

168

 	my_config alsa CONFIG_ALSA

169

 	my_config jack CONFIG_JACK

170

@@ -103,12 +109,12 @@ src_configure() {

171

 	my_config oss CONFIG_OSS

172

173

 	if use elogind || use systemd; then

174

-		myconf="${myconf} CONFIG_MPRIS=a"

175

+		myconf+=( CONFIG_MPRIS=a )

176

 	else

177

-		myconf="${myconf} CONFIG_MPRIS=n"

178

+		myconf+=( CONFIG_MPRIS=n )

179

fi

180

181

-	./configure prefix="${EPREFIX}"/usr ${myconf} \

182

+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \

183

 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \

184

 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die

185

}

186

187

diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml

188

index f19bd0670b1..671a05ce3c8 100644

189

--- a/media-sound/cmus/metadata.xml

190

+++ b/media-sound/cmus/metadata.xml

191

@@ -7,7 +7,6 @@

192

 	</maintainer>

193

 	<use>

194

 		<flag name="cdio">Use libcdio for CD support </flag>

195

-		<flag name="cue">Enable CUE sheet parsing</flag>

196

 		<flag name="discid">Enable reading the ID of the inserted CD</flag>

197

 		<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>

198

 		<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>

1	commit: 7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8
2	Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3	AuthorDate: Sun Feb 9 20:08:05 2020 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Sun Feb 9 20:11:27 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7677b6cf
7
8	media-sound/cmus: Drop USE cue
9
10	Closes: https://bugs.gentoo.org/700122
11	Package-Manager: Portage-2.3.88, Repoman-2.3.20
12	Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14	media-sound/cmus/cmus-2.8.0.ebuild \| 34 ++++++++++++++++++++--------------
15	media-sound/cmus/cmus-9999.ebuild \| 34 ++++++++++++++++++++--------------
16	media-sound/cmus/metadata.xml \| 1 -
17	3 files changed, 40 insertions(+), 29 deletions(-)
18
19	diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
20	index 83c05f7dc5e..e4cfd45303e 100644
21	--- a/media-sound/cmus/cmus-2.8.0.ebuild
22	+++ b/media-sound/cmus/cmus-2.8.0.ebuild
23	@@ -1,4 +1,4 @@
24	-# Copyright 1999-2019 Gentoo Authors
25	+# Copyright 1999-2020 Gentoo Authors
26	# Distributed under the terms of the GNU General Public License v2
27
28	EAPI=7
29	@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
30
31	LICENSE="GPL-2"
32	SLOT="0"
33	-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
34	+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
35	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
36	+vorbis wavpack"
37
38	@@ -34,7 +34,6 @@ DEPEND="
39	ao? ( media-libs/libao )
40	cddb? ( media-libs/libcddb )
41	cdio? ( dev-libs/libcdio-paranoia )
42	- cue? ( media-libs/libcue )
43	discid? ( media-libs/libdiscid )
44	elogind? ( sys-auth/elogind )
45	ffmpeg? ( media-video/ffmpeg:= )
46	@@ -74,16 +73,24 @@ PATCHES=(
47
48	S="${WORKDIR}/${P/_/-}"
49
50	-my_config() {
51	- local value
52	- use ${1} && value=a \|\| value=n
53	- myconf="${myconf} ${2}=${value}"
54	-}
55	-
56	src_configure() {
57	- local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
58	+ my_config() {
59	+ local value
60	+ use ${1} && value=a \|\| value=n
61	+ myconf+=( ${2}=${value} )
62	+ }
63
64	+ local debuglevel=1
65	use debug && debuglevel=2
66	+ local myconf=(
67	+ CONFIG_CUE=y
68	+ CONFIG_ARTS=n
69	+ CONFIG_SUN=n
70	+ CONFIG_SNDIO=n
71	+ CONFIG_WAVEOUT=n
72	+ CONFIG_VTX=n
73	+ CONFIG_ROAR=n
74	+ )
75
76	my_config cddb CONFIG_CDDB
77	my_config cdio CONFIG_CDIO
78	@@ -100,7 +107,6 @@ src_configure() {
79	my_config mp4 CONFIG_MP4
80	my_config aac CONFIG_AAC
81	my_config ffmpeg CONFIG_FFMPEG
82	- my_config cue CONFIG_CUE
83	my_config pulseaudio CONFIG_PULSE
84	my_config alsa CONFIG_ALSA
85	my_config jack CONFIG_JACK
86	@@ -109,12 +115,12 @@ src_configure() {
87	my_config oss CONFIG_OSS
88
89	if use elogind \|\| use systemd; then
90	- myconf="${myconf} CONFIG_MPRIS=a"
91	+ myconf+=( CONFIG_MPRIS=a )
92	else
93	- myconf="${myconf} CONFIG_MPRIS=n"
94	+ myconf+=( CONFIG_MPRIS=n )
95	fi
96
97	- ./configure prefix="${EPREFIX}"/usr ${myconf} \
98	+ ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
99	exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
100	libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} \|\| die
101	}
102
103	diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
104	index 6ae109af57a..283dda19519 100644
105	--- a/media-sound/cmus/cmus-9999.ebuild
106	+++ b/media-sound/cmus/cmus-9999.ebuild
107	@@ -1,4 +1,4 @@
108	-# Copyright 1999-2019 Gentoo Authors
109	+# Copyright 1999-2020 Gentoo Authors
110	# Distributed under the terms of the GNU General Public License v2
111
112	EAPI=7
113	@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
114
115	LICENSE="GPL-2"
116	SLOT="0"
117	-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
118	+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
119	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
120	+vorbis wavpack"
121
122	@@ -34,7 +34,6 @@ DEPEND="
123	ao? ( media-libs/libao )
124	cddb? ( media-libs/libcddb )
125	cdio? ( dev-libs/libcdio-paranoia )
126	- cue? ( media-libs/libcue )
127	discid? ( media-libs/libdiscid )
128	elogind? ( sys-auth/elogind )
129	ffmpeg? ( media-video/ffmpeg:= )
130	@@ -68,16 +67,24 @@ DOCS=( AUTHORS README.md )
131
132	S="${WORKDIR}/${P/_/-}"
133
134	-my_config() {
135	- local value
136	- use ${1} && value=a \|\| value=n
137	- myconf="${myconf} ${2}=${value}"
138	-}
139	-
140	src_configure() {
141	- local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
142	+ my_config() {
143	+ local value
144	+ use ${1} && value=a \|\| value=n
145	+ myconf+=( ${2}=${value} )
146	+ }
147
148	+ local debuglevel=1
149	use debug && debuglevel=2
150	+ local myconf=(
151	+ CONFIG_CUE=y
152	+ CONFIG_ARTS=n
153	+ CONFIG_SUN=n
154	+ CONFIG_SNDIO=n
155	+ CONFIG_WAVEOUT=n
156	+ CONFIG_VTX=n
157	+ CONFIG_ROAR=n
158	+ )
159
160	my_config cddb CONFIG_CDDB
161	my_config cdio CONFIG_CDIO
162	@@ -94,7 +101,6 @@ src_configure() {
163	my_config mp4 CONFIG_MP4
164	my_config aac CONFIG_AAC
165	my_config ffmpeg CONFIG_FFMPEG
166	- my_config cue CONFIG_CUE
167	my_config pulseaudio CONFIG_PULSE
168	my_config alsa CONFIG_ALSA
169	my_config jack CONFIG_JACK
170	@@ -103,12 +109,12 @@ src_configure() {
171	my_config oss CONFIG_OSS
172
173	if use elogind \|\| use systemd; then
174	- myconf="${myconf} CONFIG_MPRIS=a"
175	+ myconf+=( CONFIG_MPRIS=a )
176	else
177	- myconf="${myconf} CONFIG_MPRIS=n"
178	+ myconf+=( CONFIG_MPRIS=n )
179	fi
180
181	- ./configure prefix="${EPREFIX}"/usr ${myconf} \
182	+ ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
183	exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
184	libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} \|\| die
185	}
186
187	diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
188	index f19bd0670b1..671a05ce3c8 100644
189	--- a/media-sound/cmus/metadata.xml
190	+++ b/media-sound/cmus/metadata.xml
191	@@ -7,7 +7,6 @@
192	</maintainer>
193	<use>
194	<flag name="cdio">Use libcdio for CD support </flag>
195	- <flag name="cue">Enable CUE sheet parsing</flag>
196	<flag name="discid">Enable reading the ID of the inserted CD</flag>
197	<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>
198	<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>

Gentoo Archives: gentoo-commits