Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mpd/, media-sound/mpd/files/
Date: Thu, 15 Nov 2018 14:01:00
Message-Id: 1542290450.950e2bdecd79461a5eb2b04c1f641f372ac8ca6f.zlogene@gentoo
1 commit: 950e2bdecd79461a5eb2b04c1f641f372ac8ca6f
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 15 14:00:28 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 15 14:00:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950e2bde
7
8 media-sound/mpd: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 media-sound/mpd/Manifest | 1 -
14 media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch | 27 ---
15 media-sound/mpd/files/mpd-0.20.4.logrotate | 6 -
16 media-sound/mpd/mpd-0.20.10.ebuild | 263 ----------------------
17 4 files changed, 297 deletions(-)
18
19 diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
20 index b84c463d156..e3c66a4a4f9 100644
21 --- a/media-sound/mpd/Manifest
22 +++ b/media-sound/mpd/Manifest
23 @@ -1,4 +1,3 @@
24 -DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
25 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
26 DIST mpd-0.21.1.tar.xz 662308 BLAKE2B 59da1cf186d5a171d447bde8e17386b49e3b4e821b4afc429b5e70a7633fe23f9ef671debda4bdf46632a12f008dbfe68966c52e4d298aca0a063dda6ca615da SHA512 9af720f7bb7120a6c6006ad21cd80a61c0f1976ced7b2e6815d5e33d8b1e9caf4e8a0047754db3eb37875176754fbf03bfd77b26232ef4aec9da48667694ba92
27 DIST mpd-0.21.2.tar.xz 664408 BLAKE2B da1cde9b5f87c3e52c90d9a743ec8bf7acbcf52f3bf28969414bcc0f3f29151fd47157dc153a094844c94f6eb50e5a3564baf66a2e87d840b7b34efc8d0f760b SHA512 a98ff2636a22f7f0e377f814d0312b03344624317a68fcd89a7c5f33a40629908cd19f8bfff5dde1eef96cebd93e92cef63153bf60b02791803532357a38e020
28
29 diff --git a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch b/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
30 deleted file mode 100644
31 index 9153a87dcf9..00000000000
32 --- a/media-sound/mpd/files/mpd-0.20.10-libcdio-2.patch
33 +++ /dev/null
34 @@ -1,27 +0,0 @@
35 -From 12fd1cad0cc5472cbe931516970c1ac7aeb7ec00 Mon Sep 17 00:00:00 2001
36 -From: Max Kellermann <max@×××××××.org>
37 -Date: Sat, 3 Feb 2018 19:32:31 +0100
38 -Subject: [PATCH] archive/iso9660: libcdio 2.0 compatibility
39 -
40 -Closes #173
41 ----
42 - src/archive/plugins/Iso9660ArchivePlugin.cxx | 5 +++++
43 - 1 file changed, 5 insertions(+)
44 -
45 -diff --git a/src/archive/plugins/Iso9660ArchivePlugin.cxx b/src/archive/plugins/Iso9660ArchivePlugin.cxx
46 -index 536745d85..363921527 100644
47 ---- a/src/archive/plugins/Iso9660ArchivePlugin.cxx
48 -+++ b/src/archive/plugins/Iso9660ArchivePlugin.cxx
49 -@@ -115,7 +115,12 @@ Iso9660ArchiveFile::Visit(char *path, size_t length, size_t capacity,
50 - visitor.VisitArchiveEntry(path + 1);
51 - }
52 - }
53 -+
54 -+#if LIBCDIO_VERSION_NUM >= 20000
55 -+ iso9660_filelist_free(entlist);
56 -+#else
57 - _cdio_list_free (entlist, true);
58 -+#endif
59 - }
60 -
61 - static ArchiveFile *
62
63 diff --git a/media-sound/mpd/files/mpd-0.20.4.logrotate b/media-sound/mpd/files/mpd-0.20.4.logrotate
64 deleted file mode 100644
65 index ff47d1098cf..00000000000
66 --- a/media-sound/mpd/files/mpd-0.20.4.logrotate
67 +++ /dev/null
68 @@ -1,6 +0,0 @@
69 -/var/lib/mpd/log {
70 - missingok
71 - postrotate
72 - /etc/init.d/mpd reload
73 - endscript
74 -}
75
76 diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
77 deleted file mode 100644
78 index e61366e3f1d..00000000000
79 --- a/media-sound/mpd/mpd-0.20.10.ebuild
80 +++ /dev/null
81 @@ -1,263 +0,0 @@
82 -# Copyright 1999-2018 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=6
86 -
87 -inherit autotools flag-o-matic linux-info systemd user
88 -
89 -DESCRIPTION="The Music Player Daemon (mpd)"
90 -HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
91 -SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
92 -
93 -LICENSE="GPL-2"
94 -SLOT="0"
95 -KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
96 -IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
97 - +fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
98 - lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
99 - mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
100 - samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
101 - unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
102 -
103 -OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
104 -DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
105 - modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
106 -ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
107 -
108 -REQUIRED_USE="
109 - || ( ${OUTPUT_PLUGINS} )
110 - || ( ${DECODER_PLUGINS} )
111 - network? ( || ( ${ENCODER_PLUGINS} ) )
112 - recorder? ( || ( ${ENCODER_PLUGINS} ) )
113 - opus? ( ogg )
114 - upnp? ( expat )
115 - webdav? ( curl expat )
116 -"
117 -
118 -CDEPEND="!<sys-cluster/mpich2-1.4_rc2
119 - adplug? ( media-libs/adplug )
120 - alsa? (
121 - media-sound/alsa-utils
122 - media-libs/alsa-lib
123 - )
124 - ao? ( media-libs/libao[alsa?,pulseaudio?] )
125 - audiofile? ( media-libs/audiofile )
126 - bzip2? ( app-arch/bzip2 )
127 - cdio? ( dev-libs/libcdio-paranoia )
128 - curl? ( net-misc/curl )
129 - expat? ( dev-libs/expat )
130 - faad? ( media-libs/faad2 )
131 - ffmpeg? (
132 - libav? ( media-video/libav:0= )
133 - !libav? ( media-video/ffmpeg:0= )
134 - )
135 - flac? ( media-libs/flac[ogg?] )
136 - fluidsynth? ( media-sound/fluidsynth )
137 - gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
138 - icu? ( dev-libs/icu:= )
139 - id3tag? ( media-libs/libid3tag )
140 - jack? ( virtual/jack )
141 - lame? ( network? ( media-sound/lame ) )
142 - libmpdclient? ( media-libs/libmpdclient )
143 - libsamplerate? ( media-libs/libsamplerate )
144 - libsoxr? ( media-libs/soxr )
145 - mad? ( media-libs/libmad )
146 - mikmod? ( media-libs/libmikmod:0 )
147 - mms? ( media-libs/libmms )
148 - modplug? ( media-libs/libmodplug )
149 - mpg123? ( >=media-sound/mpg123-1.12.2 )
150 - musepack? ( media-sound/musepack-tools )
151 - network? (
152 - >=media-libs/libshout-2
153 - !lame? ( !vorbis? ( media-libs/libvorbis ) )
154 - )
155 - nfs? ( net-fs/libnfs )
156 - ogg? ( media-libs/libogg )
157 - openal? ( media-libs/openal )
158 - opus? ( media-libs/opus )
159 - pulseaudio? ( media-sound/pulseaudio )
160 - samba? ( >=net-fs/samba-4.0.25 )
161 - sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
162 - sndfile? ( media-libs/libsndfile )
163 - soundcloud? ( >=dev-libs/yajl-2:= )
164 - sqlite? ( dev-db/sqlite:3 )
165 - systemd? ( sys-apps/systemd )
166 - tcpd? ( sys-apps/tcp-wrappers )
167 - twolame? ( media-sound/twolame )
168 - upnp? ( net-libs/libupnp:= )
169 - vorbis? ( media-libs/libvorbis )
170 - wavpack? ( media-sound/wavpack )
171 - wildmidi? ( media-sound/wildmidi )
172 - zeroconf? ( net-dns/avahi[dbus] )
173 - zip? ( dev-libs/zziplib )
174 - zlib? ( sys-libs/zlib )"
175 -DEPEND="${CDEPEND}
176 - dev-libs/boost
177 - virtual/pkgconfig"
178 -RDEPEND="${CDEPEND}
179 - selinux? ( sec-policy/selinux-mpd )
180 -"
181 -
182 -PATCHES=(
183 - "${FILESDIR}"/${PN}-0.18.conf.patch
184 - "${FILESDIR}"/${P}-libcdio-2.patch
185 -)
186 -
187 -pkg_setup() {
188 - use network || ewarn "Icecast and Shoutcast streaming needs networking."
189 - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
190 -
191 - enewuser mpd "" "" "/var/lib/mpd" audio
192 -
193 - if use eventfd; then
194 - CONFIG_CHECK+=" ~EVENTFD"
195 - ERROR_EVENTFD="${P} requires eventfd in-kernel support."
196 - fi
197 - if use signalfd; then
198 - CONFIG_CHECK+=" ~SIGNALFD"
199 - ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
200 - fi
201 - if use inotify; then
202 - CONFIG_CHECK+=" ~INOTIFY_USER"
203 - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
204 - fi
205 - if use eventfd || use signalfd || use inotify; then
206 - linux-info_pkg_setup
207 - fi
208 -
209 - elog "If you will be starting mpd via /etc/init.d/mpd, please make
210 - sure that MPD's pid_file is _set_."
211 -}
212 -
213 -src_prepare() {
214 - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
215 - default
216 - eautoreconf
217 -}
218 -
219 -src_configure() {
220 - local myeconfargs=(
221 - --enable-database --disable-roar --disable-documentation
222 - --enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
223 - --disable-solaris-output --enable-tcp --enable-un --disable-werror
224 - --docdir="${EPREFIX}"/usr/share/doc/${PF}
225 - )
226 -
227 - if use network; then
228 - myeconfargs+=(
229 - --enable-shout
230 - $(use_enable vorbis vorbis-encoder)
231 - --enable-httpd-output
232 - $(use_enable lame lame-encoder)
233 - $(use_enable twolame twolame-encoder)
234 - $(use_enable audiofile wave-encoder)
235 - )
236 - else
237 - myeconfargs+=(
238 - --disable-shout
239 - --disable-vorbis-encoder
240 - --disable-httpd-output
241 - --disable-lame-encoder
242 - --disable-twolame-encoder
243 - --disable-wave-encoder
244 - )
245 - fi
246 -
247 - if use samba || use upnp; then
248 - myeconfargs+=( --enable-neighbor-plugins )
249 - fi
250 -
251 - append-lfs-flags
252 - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
253 -
254 - myeconfargs+=(
255 - $(use_enable eventfd)
256 - $(use_enable signalfd)
257 - $(use_enable libmpdclient)
258 - $(use_enable expat)
259 - $(use_enable upnp)
260 - $(use_enable adplug)
261 - $(use_enable alsa)
262 - $(use_enable ao)
263 - $(use_enable audiofile)
264 - $(use_enable zlib)
265 - $(use_enable bzip2)
266 - $(use_enable cdio cdio-paranoia)
267 - $(use_enable curl)
268 - $(use_enable samba smbclient)
269 - $(use_enable nfs)
270 - $(use_enable debug)
271 - $(use_enable ffmpeg)
272 - $(use_enable fifo)
273 - $(use_enable flac)
274 - $(use_enable fluidsynth)
275 - $(use_enable gme)
276 - $(use_enable id3tag id3)
277 - $(use_enable inotify)
278 - $(use_enable ipv6)
279 - $(use_enable cdio iso9660)
280 - $(use_enable jack)
281 - $(use_enable soundcloud)
282 - $(use_enable tcpd libwrap)
283 - $(use_enable libsamplerate lsr)
284 - $(use_enable libsoxr soxr)
285 - $(use_enable mad)
286 - $(use_enable mikmod)
287 - $(use_enable mms)
288 - $(use_enable modplug)
289 - $(use_enable musepack mpc)
290 - $(use_enable mpg123)
291 - $(use_enable openal)
292 - $(use_enable opus)
293 - $(use_enable oss)
294 - $(use_enable pipe pipe-output)
295 - $(use_enable pulseaudio pulse)
296 - $(use_enable recorder recorder-output)
297 - $(use_enable sid sidplay)
298 - $(use_enable sndfile sndfile)
299 - $(use_enable sqlite)
300 - $(use_enable systemd systemd_daemon)
301 - $(use_enable vorbis)
302 - $(use_enable wavpack)
303 - $(use_enable wildmidi)
304 - $(use_enable zip zzip)
305 - $(use_enable icu)
306 - $(use_enable webdav)
307 - $(use_enable faad aac)
308 - $(use_with zeroconf zeroconf avahi)
309 - --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
310 - --with-systemduserunitdir=$(systemd_get_userunitdir)
311 - )
312 -
313 - econf "${myeconfargs[@]}"
314 -}
315 -
316 -src_install() {
317 - emake DESTDIR="${D}" install
318 -
319 - insinto /etc
320 - newins doc/mpdconf.dist mpd.conf
321 -
322 - newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
323 -
324 - if use unicode; then
325 - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
326 - "${ED}"/etc/mpd.conf || die "sed failed"
327 - fi
328 -
329 - insinto /etc/logrotate.d
330 - newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
331 -
332 - use prefix || diropts -m0755 -o mpd -g audio
333 - dodir /var/lib/mpd
334 - keepdir /var/lib/mpd
335 - dodir /var/lib/mpd/music
336 - keepdir /var/lib/mpd/music
337 - dodir /var/lib/mpd/playlists
338 - keepdir /var/lib/mpd/playlists
339 -}
340 -
341 -pkg_postinst() {
342 - # also change the homedir if the user has existed before
343 - usermod -d "/var/lib/mpd" mpd
344 -}