From 028d984347a40b9088352ac07debac18f6b9ec66 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sat, 6 Oct 2012 20:50:20 +0000 Subject: Version bump, remove old (Portage version: 2.2.0_alpha134/cvs/Linux x86_64) --- media-sound/mpd/ChangeLog | 11 +- media-sound/mpd/files/0.15.1-mpdconf.patch | 74 -------- media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch | 21 --- .../mpd/files/mpd-0.16.4-include-stdio.patch | 10 -- media-sound/mpd/files/mpd-0.17-noise.patch | 42 ----- media-sound/mpd/files/mpd.conf.patch | 69 -------- media-sound/mpd/files/mpd.rc | 33 ---- media-sound/mpd/mpd-0.16.2.ebuild | 181 ------------------- media-sound/mpd/mpd-0.16.5.ebuild | 181 ------------------- media-sound/mpd/mpd-0.16.6.ebuild | 181 ------------------- media-sound/mpd/mpd-0.16.7.ebuild | 182 -------------------- media-sound/mpd/mpd-0.17-r1.ebuild | 191 --------------------- media-sound/mpd/mpd-0.17.2.ebuild | 190 ++++++++++++++++++++ media-sound/mpd/mpd-0.17.ebuild | 188 -------------------- 14 files changed, 200 insertions(+), 1354 deletions(-) delete mode 100644 media-sound/mpd/files/0.15.1-mpdconf.patch delete mode 100644 media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch delete mode 100644 media-sound/mpd/files/mpd-0.16.4-include-stdio.patch delete mode 100644 media-sound/mpd/files/mpd-0.17-noise.patch delete mode 100644 media-sound/mpd/files/mpd.conf.patch delete mode 100755 media-sound/mpd/files/mpd.rc delete mode 100644 media-sound/mpd/mpd-0.16.2.ebuild delete mode 100644 media-sound/mpd/mpd-0.16.5.ebuild delete mode 100644 media-sound/mpd/mpd-0.16.6.ebuild delete mode 100644 media-sound/mpd/mpd-0.16.7.ebuild delete mode 100644 media-sound/mpd/mpd-0.17-r1.ebuild create mode 100644 media-sound/mpd/mpd-0.17.2.ebuild delete mode 100644 media-sound/mpd/mpd-0.17.ebuild (limited to 'media-sound/mpd') diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 914bcc6beec3..5b79f99138e3 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/mpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.300 2012/10/05 17:56:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.301 2012/10/06 20:50:20 angelos Exp $ + +*mpd-0.17.2 (06 Oct 2012) + + 06 Oct 2012; Christoph Mende +mpd-0.17.2.ebuild, + -files/0.15.1-mpdconf.patch, -files/mpd-0.16.3-ffmpeg.patch, + -files/mpd-0.16.4-include-stdio.patch, -files/mpd-0.17-noise.patch, + -files/mpd.conf.patch, -files/mpd.rc, -mpd-0.16.2.ebuild, -mpd-0.16.5.ebuild, + -mpd-0.16.6.ebuild, -mpd-0.16.7.ebuild, -mpd-0.17-r1.ebuild, -mpd-0.17.ebuild: + Version bump, remove old 05 Oct 2012; Brent Baude mpd-0.16.8.ebuild: Marking mpd-0.16.8 ppc64 for bug 426834 diff --git a/media-sound/mpd/files/0.15.1-mpdconf.patch b/media-sound/mpd/files/0.15.1-mpdconf.patch deleted file mode 100644 index 3a71af927e5c..000000000000 --- a/media-sound/mpd/files/0.15.1-mpdconf.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ur mpd-0.15.1.orig/doc/mpdconf.example mpd-0.15.1/doc/mpdconf.example ---- mpd-0.15.1.orig/doc/mpdconf.example 2009-07-15 23:34:47.000000000 +0300 -+++ mpd-0.15.1/doc/mpdconf.example 2009-07-22 15:21:28.000000000 +0300 -@@ -10,14 +10,14 @@ - # be disabled and audio files will only be accepted over ipc socket (using - # file:// protocol) or streaming files over an accepted protocol. - # --#music_directory "~/music" -+music_directory "/var/lib/mpd/music" - # - # This setting sets the MPD internal playlist directory. The purpose of this - # directory is storage for playlists created by MPD. The server will use - # playlist files not created by the server but only if they are in the MPD - # format. This setting defaults to playlist saving being disabled. - # --#playlist_directory "~/.mpd/playlists" -+playlist_directory "/var/lib/mpd/playlists" - # - # This setting sets the location of the MPD database. This file is used to - # load the database at server start up and store the database while the -@@ -25,7 +25,7 @@ - # MPD to accept files over ipc socket (using file:// protocol) or streaming - # files over an accepted protocol. - # --#db_file "~/.mpd/database" -+db_file "/var/lib/mpd/database" - # - # These settings are the locations for the daemon log files for the daemon. - # These logs are great for troubleshooting, depending on your log_level -@@ -34,20 +34,20 @@ - # The special value "syslog" makes MPD use the local syslog daemon. This - # setting defaults to logging to syslog, otherwise logging is disabled. - # --#log_file "~/.mpd/log" -+log_file "/var/log/mpd/mpd.log" - # - # This setting sets the location of the file which stores the process ID - # for use of mpd --kill and some init scripts. This setting is disabled by - # default and the pid file will not be stored. - # --#pid_file "~/.mpd/pid" -+pid_file "/var/run/mpd/mpd.pid" - # - # This setting sets the location of the file which contains information about - # most variables to get MPD back into the same general shape it was in before - # it was brought down. This setting is disabled by default and the server - # state will be reset on server start up. - # --#state_file "~/.mpd/state" -+state_file "/var/lib/mpd/state" - # - ############################################################################### - -@@ -59,17 +59,17 @@ - # initialization. This setting is disabled by default and MPD is run as the - # current user. - # --#user "nobody" -+user "mpd" - # - # This setting sets the address for the daemon to listen on. Careful attention - # should be paid if this is assigned to anything other then the default, any. - # This setting can deny access to control of the daemon. - # - # For network --#bind_to_address "any" -+bind_to_address "localhost" - # - # And for Unix Socket --#bind_to_address "~/.mpd/socket" -+bind_to_address "/var/lib/mpd/socket" - # - # This setting is the TCP port that is desired for the daemon to get assigned - # to. diff --git a/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch b/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch deleted file mode 100644 index a945a0a6ab33..000000000000 --- a/media-sound/mpd/files/mpd-0.16.3-ffmpeg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c ---- mpd-0.16.3.orig/src/decoder/ffmpeg_decoder_plugin.c 2011-06-04 17:36:33.000000000 +0300 -+++ mpd-0.16.3/src/decoder/ffmpeg_decoder_plugin.c 2011-06-24 18:18:51.840218251 +0300 -@@ -321,7 +321,7 @@ - } - - //ffmpeg works with ours "fileops" helper -- AVFormatContext *format_context; -+ AVFormatContext *format_context = NULL; - if (av_open_input_stream(&format_context, stream->io, input->uri, - input_format, NULL) != 0) { - g_warning("Open failed\n"); -@@ -470,7 +470,7 @@ - if (stream == NULL) - return NULL; - -- AVFormatContext *f; -+ AVFormatContext *f = NULL; - if (av_open_input_stream(&f, stream->io, is->uri, - input_format, NULL) != 0) { - mpd_ffmpeg_stream_close(stream); diff --git a/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch b/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch deleted file mode 100644 index df1cae801461..000000000000 --- a/media-sound/mpd/files/mpd-0.16.4-include-stdio.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mpd-0.16.4/src/decoder/audiofile_decoder_plugin.c.orig -+++ mpd-0.16.4/src/decoder/audiofile_decoder_plugin.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #undef G_LOG_DOMAIN - #define G_LOG_DOMAIN "audiofile" diff --git a/media-sound/mpd/files/mpd-0.17-noise.patch b/media-sound/mpd/files/mpd-0.17-noise.patch deleted file mode 100644 index ee19109d85de..000000000000 --- a/media-sound/mpd/files/mpd-0.17-noise.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dbee2f199640ec296b049801fe79e35c4b3424f6 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Mon, 09 Jul 2012 23:14:43 +0000 -Subject: output_init: put the "convert" filter at the end of the list - -No, really! This fixes a regression of commit 74617389, which -changed the order of filter plugins. ---- -diff --git a/src/output_init.c b/src/output_init.c -index d2c86bf..c3b808e 100644 ---- a/src/output_init.c -+++ b/src/output_init.c -@@ -213,13 +213,6 @@ ao_base_init(struct audio_output *ao, - ao->replay_gain_filter = NULL; - ao->other_replay_gain_filter = NULL; - -- /* the "convert" filter must be the last one in the chain */ -- -- ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL); -- assert(ao->convert_filter != NULL); -- -- filter_chain_append(ao->filter, ao->convert_filter); -- - /* done */ - - return true; -@@ -280,6 +273,13 @@ audio_output_setup(struct audio_output *ao, const struct config_param *param, - return false; - } - -+ /* the "convert" filter must be the last one in the chain */ -+ -+ ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL); -+ assert(ao->convert_filter != NULL); -+ -+ filter_chain_append(ao->filter, ao->convert_filter); -+ - return true; - } - --- -cgit v0.9.0.3-66-g3205 diff --git a/media-sound/mpd/files/mpd.conf.patch b/media-sound/mpd/files/mpd.conf.patch deleted file mode 100644 index d61d1218b90a..000000000000 --- a/media-sound/mpd/files/mpd.conf.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/doc/mpdconf.example b/doc/mpdconf.example -index 11b14bd..6b24322 100644 ---- a/doc/mpdconf.example -+++ b/doc/mpdconf.example -@@ -10,14 +10,14 @@ - # be disabled and audio files will only be accepted over ipc socket (using - # file:// protocol) or streaming files over an accepted protocol. - # --#music_directory "~/music" -+music_directory "/var/lib/mpd/music" - # - # This setting sets the MPD internal playlist directory. The purpose of this - # directory is storage for playlists created by MPD. The server will use - # playlist files not created by the server but only if they are in the MPD - # format. This setting defaults to playlist saving being disabled. - # --#playlist_directory "~/.mpd/playlists" -+playlist_directory "/var/lib/mpd/playlists" - # - # This setting sets the location of the MPD database. This file is used to - # load the database at server start up and store the database while the -@@ -25,7 +25,7 @@ - # MPD to accept files over ipc socket (using file:// protocol) or streaming - # files over an accepted protocol. - # --#db_file "~/.mpd/database" -+db_file "/var/lib/mpd/database" - # - # These settings are the locations for the daemon log files for the daemon. - # These logs are great for troubleshooting, depending on your log_level -@@ -34,7 +34,7 @@ - # The special value "syslog" makes MPD use the local syslog daemon. This - # setting defaults to logging to syslog, otherwise logging is disabled. - # --#log_file "~/.mpd/log" -+log_file "/var/log/mpd.log" - # - # This setting sets the location of the file which stores the process ID - # for use of mpd --kill and some init scripts. This setting is disabled by -@@ -47,7 +47,7 @@ - # it was brought down. This setting is disabled by default and the server - # state will be reset on server start up. - # --#state_file "~/.mpd/state" -+state_file "/var/lib/mpd/state" - # - ############################################################################### - -@@ -59,17 +59,17 @@ - # initialization. This setting is disabled by default and MPD is run as the - # current user. - # --#user "nobody" -+user "mpd" - # - # This setting sets the address for the daemon to listen on. Careful attention - # should be paid if this is assigned to anything other then the default, any. - # This setting can deny access to control of the daemon. - # - # For network --#bind_to_address "any" -+bind_to_address "localhost" - # - # And for Unix Socket --#bind_to_address "~/.mpd/socket" -+bind_to_address "/var/lib/mpd/socket" - # - # This setting is the TCP port that is desired for the daemon to get assigned - # to. diff --git a/media-sound/mpd/files/mpd.rc b/media-sound/mpd/files/mpd.rc deleted file mode 100755 index 0a78ff1f82e3..000000000000 --- a/media-sound/mpd/files/mpd.rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/files/mpd.rc,v 1.5 2009/07/25 11:10:18 ssuominen Exp $ - -depend() { - need localmount - use net.lo netmount nfsmount esound pulseaudio -} - -checkconfig() { - if ! [ -f /etc/mpd.conf ]; then - eerror "Configuration file /etc/mpd.conf does not exist." - return 1 - fi - - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting Music Player Daemon" - /usr/bin/mpd /etc/mpd.conf - eend $? -} - -stop() { - ebegin "Stopping Music Player Daemon" - /usr/bin/mpd --kill /etc/mpd.conf - sleep 0.1 - eend $? -} diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild deleted file mode 100644 index 6f62f42de6fa..000000000000 --- a/media-sound/mpd/mpd-0.16.2.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.18 2012/06/01 03:11:53 zmedico Exp $ - -EAPI=4 -inherit eutils flag-o-matic linux-info multilib user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="http://www.musicpd.org" -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac -fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate -+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid -sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip" - -REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) - || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack - ogg flac sid vorbis wavpack wildmidi ) - network? ( || ( audiofile flac lame twolame vorbis ) ) - lastfmradio? ( curl )" - -RDEPEND="!=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - id3tag? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - mms? ( media-libs/libmms ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod:0 ) - modplug? ( media-libs/libmodplug ) - mpg123? ( >=media-sound/mpg123-1.12.2 ) - musepack? ( media-sound/musepack-tools ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( sys-apps/tcp-wrappers ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - - enewuser mpd "" "" "/var/lib/mpd" audio - - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - linux-info_pkg_setup - fi -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${PN}-0.16.conf.patch -} - -src_configure() { - local mpdconf="--enable-tcp --enable-un --disable-documentation - --disable-ffado --disable-gme --enable-largefile - --disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}" - - if use network; then - mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) - --enable-httpd-output $(use_enable lame lame-encoder) - $(use_enable twolame twolame-encoder) - $(use_enable audiofile wave-encoder)" - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder - --disable-twolame-encoder --disable-wave-encoder" - fi - - if use flac && use ogg; then - mpdconf+=" --enable-oggflac" - else - mpdconf+=" --disable-oggflac" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ - $(use_enable cdio iso9660) \ - $(use_enable cue) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable ffmpeg) \ - $(use_enable fifo) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable id3tag id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable mms) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable openal) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable profile gprof) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sndfile sndfile) \ - $(use_enable sqlite) \ - $(use_enable tcpd libwrap) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_with zeroconf zeroconf avahi) \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${D}"/etc/mpd.conf || die "sed failed" - fi - - diropts -m0755 -o mpd -g audio - dodir /var/lib/mpd - keepdir /var/lib/mpd - dodir /var/lib/mpd/music - keepdir /var/lib/mpd/music - dodir /var/lib/mpd/playlists - keepdir /var/lib/mpd/playlists -} - -pkg_postinst() { - elog "If you will be starting mpd via /etc/init.d/mpd, please make" - elog "sure that MPD's pid_file is unset." - - # also change the homedir if the user has existed before - usermod -d "/var/lib/mpd" mpd -} diff --git a/media-sound/mpd/mpd-0.16.5.ebuild b/media-sound/mpd/mpd-0.16.5.ebuild deleted file mode 100644 index 2cdd67d97387..000000000000 --- a/media-sound/mpd/mpd-0.16.5.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.5.ebuild,v 1.11 2012/06/01 03:11:53 zmedico Exp $ - -EAPI=4 -inherit eutils flag-o-matic linux-info multilib user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="http://www.musicpd.org" -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac -fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate -+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid -sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip" - -REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) - || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack - ogg flac sid vorbis wavpack wildmidi ) - network? ( || ( audiofile flac lame twolame vorbis ) ) - lastfmradio? ( curl )" - -RDEPEND="!=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - id3tag? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - mms? ( media-libs/libmms ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod:0 ) - modplug? ( media-libs/libmodplug ) - mpg123? ( >=media-sound/mpg123-1.12.2 ) - musepack? ( media-sound/musepack-tools ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( sys-apps/tcp-wrappers ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - - enewuser mpd "" "" "/var/lib/mpd" audio - - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - linux-info_pkg_setup - fi -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${PN}-0.16.conf.patch -} - -src_configure() { - local mpdconf="--enable-tcp --enable-un --disable-documentation - --disable-ffado --disable-gme --enable-largefile - --disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}" - - if use network; then - mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) - --enable-httpd-output $(use_enable lame lame-encoder) - $(use_enable twolame twolame-encoder) - $(use_enable audiofile wave-encoder)" - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder - --disable-twolame-encoder --disable-wave-encoder" - fi - - if use flac && use ogg; then - mpdconf+=" --enable-oggflac" - else - mpdconf+=" --disable-oggflac" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ - $(use_enable cdio iso9660) \ - $(use_enable cue) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable ffmpeg) \ - $(use_enable fifo) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable id3tag id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable mms) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable openal) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable profile gprof) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sndfile sndfile) \ - $(use_enable sqlite) \ - $(use_enable tcpd libwrap) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_with zeroconf zeroconf avahi) \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${D}"/etc/mpd.conf || die "sed failed" - fi - - diropts -m0755 -o mpd -g audio - dodir /var/lib/mpd - keepdir /var/lib/mpd - dodir /var/lib/mpd/music - keepdir /var/lib/mpd/music - dodir /var/lib/mpd/playlists - keepdir /var/lib/mpd/playlists -} - -pkg_postinst() { - elog "If you will be starting mpd via /etc/init.d/mpd, please make" - elog "sure that MPD's pid_file is unset." - - # also change the homedir if the user has existed before - usermod -d "/var/lib/mpd" mpd -} diff --git a/media-sound/mpd/mpd-0.16.6.ebuild b/media-sound/mpd/mpd-0.16.6.ebuild deleted file mode 100644 index 5c1f4c54a7fe..000000000000 --- a/media-sound/mpd/mpd-0.16.6.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $ - -EAPI=4 -inherit eutils flag-o-matic linux-info multilib user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="http://www.musicpd.org" -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac -fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate -+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid -sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip" - -REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) - || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack - ogg flac sid vorbis wavpack wildmidi ) - network? ( || ( audiofile flac lame twolame vorbis ) ) - lastfmradio? ( curl )" - -RDEPEND="!=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - id3tag? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - mms? ( media-libs/libmms ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod:0 ) - modplug? ( media-libs/libmodplug ) - mpg123? ( >=media-sound/mpg123-1.12.2 ) - musepack? ( media-sound/musepack-tools ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( sys-apps/tcp-wrappers ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - - enewuser mpd "" "" "/var/lib/mpd" audio - - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - linux-info_pkg_setup - fi -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${PN}-0.16.conf.patch -} - -src_configure() { - local mpdconf="--enable-tcp --enable-un --disable-documentation - --disable-ffado --disable-gme --enable-largefile - --disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}" - - if use network; then - mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) - --enable-httpd-output $(use_enable lame lame-encoder) - $(use_enable twolame twolame-encoder) - $(use_enable audiofile wave-encoder)" - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder - --disable-twolame-encoder --disable-wave-encoder" - fi - - if use flac && use ogg; then - mpdconf+=" --enable-oggflac" - else - mpdconf+=" --disable-oggflac" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ - $(use_enable cdio iso9660) \ - $(use_enable cue) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable ffmpeg) \ - $(use_enable fifo) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable id3tag id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable mms) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable openal) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable profile gprof) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sndfile sndfile) \ - $(use_enable sqlite) \ - $(use_enable tcpd libwrap) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_with zeroconf zeroconf avahi) \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${D}"/etc/mpd.conf || die "sed failed" - fi - - diropts -m0755 -o mpd -g audio - dodir /var/lib/mpd - keepdir /var/lib/mpd - dodir /var/lib/mpd/music - keepdir /var/lib/mpd/music - dodir /var/lib/mpd/playlists - keepdir /var/lib/mpd/playlists -} - -pkg_postinst() { - elog "If you will be starting mpd via /etc/init.d/mpd, please make" - elog "sure that MPD's pid_file is unset." - - # also change the homedir if the user has existed before - usermod -d "/var/lib/mpd" mpd -} diff --git a/media-sound/mpd/mpd-0.16.7.ebuild b/media-sound/mpd/mpd-0.16.7.ebuild deleted file mode 100644 index 8b3bb4143f53..000000000000 --- a/media-sound/mpd/mpd-0.16.7.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.7.ebuild,v 1.5 2012/06/01 03:11:53 zmedico Exp $ - -EAPI=4 -inherit eutils flag-o-matic linux-info multilib systemd user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="http://www.musicpd.org" -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac -fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate -+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid -sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip" - -REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) - || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack - ogg flac sid vorbis wavpack wildmidi ) - network? ( || ( audiofile flac lame twolame vorbis ) ) - lastfmradio? ( curl )" - -RDEPEND="!=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - id3tag? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - mms? ( media-libs/libmms ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod:0 ) - modplug? ( media-libs/libmodplug ) - mpg123? ( >=media-sound/mpg123-1.12.2 ) - musepack? ( media-sound/musepack-tools ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( sys-apps/tcp-wrappers ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - - enewuser mpd "" "" "/var/lib/mpd" audio - - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - linux-info_pkg_setup - fi -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${PN}-0.16.conf.patch -} - -src_configure() { - local mpdconf="--enable-tcp --enable-un --disable-documentation - --disable-ffado --disable-gme --enable-largefile - --disable-mvp --docdir=${EPREFIX}/usr/share/doc/${PF}" - - if use network; then - mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) - --enable-httpd-output $(use_enable lame lame-encoder) - $(use_enable twolame twolame-encoder) - $(use_enable audiofile wave-encoder)" - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder - --disable-twolame-encoder --disable-wave-encoder" - fi - - if use flac && use ogg; then - mpdconf+=" --enable-oggflac" - else - mpdconf+=" --disable-oggflac" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ - $(use_enable cdio iso9660) \ - $(use_enable cue) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable ffmpeg) \ - $(use_enable fifo) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable id3tag id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable mms) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable openal) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable profile gprof) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sndfile sndfile) \ - $(use_enable sqlite) \ - $(use_enable tcpd libwrap) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_with zeroconf zeroconf avahi) \ - "$(systemd_with_unitdir)" \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${D}"/etc/mpd.conf || die "sed failed" - fi - - diropts -m0755 -o mpd -g audio - dodir /var/lib/mpd - keepdir /var/lib/mpd - dodir /var/lib/mpd/music - keepdir /var/lib/mpd/music - dodir /var/lib/mpd/playlists - keepdir /var/lib/mpd/playlists -} - -pkg_postinst() { - elog "If you will be starting mpd via /etc/init.d/mpd, please make" - elog "sure that MPD's pid_file is unset." - - # also change the homedir if the user has existed before - usermod -d "/var/lib/mpd" mpd -} diff --git a/media-sound/mpd/mpd-0.17-r1.ebuild b/media-sound/mpd/mpd-0.17-r1.ebuild deleted file mode 100644 index f45f9f0c27a5..000000000000 --- a/media-sound/mpd/mpd-0.17-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17-r1.ebuild,v 1.4 2012/08/04 15:16:51 jer Exp $ - -EAPI=4 -inherit eutils flag-o-matic linux-info multilib systemd user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="http://www.musicpd.org" -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos" -IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac -fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad -mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder -sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack -wildmidi zeroconf zip" - -OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" -INPUT_PLUGINS="aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 - musepack ogg flac sid vorbis wavpack wildmidi" -ENCODER_PLUGINS="audiofile flac lame twolame vorbis" - -REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} ) - || ( ${INPUT_PLUGINS} ) - network? ( || ( ${ENCODER_PLUGINS} ) ) - recorder? ( || ( ${ENCODER_PLUGINS} ) ) - lastfmradio? ( curl )" - -RDEPEND="!=media-libs/game-music-emu-0.6.0_pre20120802 ) - id3tag? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod:0 ) - mms? ( media-libs/libmms ) - modplug? ( media-libs/libmodplug ) - mpg123? ( >=media-sound/mpg123-1.12.2 ) - musepack? ( media-sound/musepack-tools ) - network? ( >=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - soundcloud? ( >=dev-libs/yajl-2 ) - soup? ( net-libs/libsoup:2.4 ) - sqlite? ( dev-db/sqlite:3 ) - systemd? ( sys-apps/systemd ) - tcpd? ( sys-apps/tcp-wrappers ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - - enewuser mpd "" "" "/var/lib/mpd" audio - - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - linux-info_pkg_setup - fi -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${PN}-0.16.conf.patch \ - "${FILESDIR}"/${P}-noise.patch -} - -src_configure() { - local mpdconf="--disable-despotify --disable-documentation --disable-ffado - --disable-mvp --disable-roar --enable-largefile - --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}" - - if use network; then - mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) - --enable-httpd-output $(use_enable lame lame-encoder) - $(use_enable twolame twolame-encoder) - $(use_enable audiofile wave-encoder)" - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder - --disable-twolame-encoder --disable-wave-encoder" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ - $(use_enable cdio cdio-paranoia) \ - $(use_enable cdio iso9660) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable ffmpeg) \ - $(use_enable fifo) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable gme) \ - $(use_enable id3tag id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable mms) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable openal) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable pulseaudio pulse) \ - $(use_enable recorder recorder-output) \ - $(use_enable sid sidplay) \ - $(use_enable sndfile sndfile) \ - $(use_enable soundcloud) \ - $(use_enable soup) \ - $(use_enable sqlite) \ - $(use_enable systemd systemd-daemon) \ - $(use_enable tcpd libwrap) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_with zeroconf zeroconf avahi) \ - "$(systemd_with_unitdir)" \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${ED}"/etc/mpd.conf || die "sed failed" - fi - - use prefix || diropts -m0755 -o mpd -g audio - dodir /var/lib/mpd - keepdir /var/lib/mpd - dodir /var/lib/mpd/music - keepdir /var/lib/mpd/music - dodir /var/lib/mpd/playlists - keepdir /var/lib/mpd/playlists -} - -pkg_postinst() { - elog "If you will be starting mpd via /etc/init.d/mpd, please make" - elog "sure that MPD's pid_file is unset." - - # also change the homedir if the user has existed before - usermod -d "/var/lib/mpd" mpd -} diff --git a/media-sound/mpd/mpd-0.17.2.ebuild b/media-sound/mpd/mpd-0.17.2.ebuild new file mode 100644 index 000000000000..3ecc884ff6c5 --- /dev/null +++ b/media-sound/mpd/mpd-0.17.2.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.2.ebuild,v 1.1 2012/10/06 20:50:20 angelos Exp $ + +EAPI=4 +inherit eutils flag-o-matic linux-info multilib systemd user + +DESCRIPTION="The Music Player Daemon (mpd)" +HOMEPAGE="http://www.musicpd.org" +SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos" +IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac +fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad +mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder +sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack +wildmidi zeroconf zip" + +OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" +INPUT_PLUGINS="aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 + musepack ogg flac sid vorbis wavpack wildmidi" +ENCODER_PLUGINS="audiofile flac lame twolame vorbis" + +REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} ) + || ( ${INPUT_PLUGINS} ) + network? ( || ( ${ENCODER_PLUGINS} ) ) + recorder? ( || ( ${ENCODER_PLUGINS} ) ) + lastfmradio? ( curl )" + +RDEPEND="!=media-libs/game-music-emu-0.6.0_pre20120802 ) + id3tag? ( media-libs/libid3tag ) + jack? ( media-sound/jack-audio-connection-kit ) + lame? ( network? ( media-sound/lame ) ) + libsamplerate? ( media-libs/libsamplerate ) + mad? ( media-libs/libmad ) + mikmod? ( media-libs/libmikmod:0 ) + mms? ( media-libs/libmms ) + modplug? ( media-libs/libmodplug ) + mpg123? ( >=media-sound/mpg123-1.12.2 ) + musepack? ( media-sound/musepack-tools ) + network? ( >=media-libs/libshout-2 + !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) + ogg? ( media-libs/libogg ) + openal? ( media-libs/openal ) + pulseaudio? ( media-sound/pulseaudio ) + sid? ( media-libs/libsidplay:2 ) + sndfile? ( media-libs/libsndfile ) + soundcloud? ( >=dev-libs/yajl-2 ) + soup? ( net-libs/libsoup:2.4 ) + sqlite? ( dev-db/sqlite:3 ) + systemd? ( sys-apps/systemd ) + tcpd? ( sys-apps/tcp-wrappers ) + twolame? ( media-sound/twolame ) + vorbis? ( media-libs/libvorbis ) + wavpack? ( media-sound/wavpack ) + wildmidi? ( media-sound/wildmidi ) + zeroconf? ( net-dns/avahi[dbus] ) + zip? ( dev-libs/zziplib )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +pkg_setup() { + use network || ewarn "Icecast and Shoutcast streaming needs networking." + use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." + + enewuser mpd "" "" "/var/lib/mpd" audio + + if use inotify; then + CONFIG_CHECK="~INOTIFY_USER" + ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." + linux-info_pkg_setup + fi +} + +src_prepare() { + cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" + epatch "${FILESDIR}"/${PN}-0.16.conf.patch +} + +src_configure() { + local mpdconf="--disable-despotify --disable-documentation --disable-ffado + --disable-mvp --disable-roar --enable-largefile + --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}" + + if use network; then + mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) + --enable-httpd-output $(use_enable lame lame-encoder) + $(use_enable twolame twolame-encoder) + $(use_enable audiofile wave-encoder)" + else + mpdconf+=" --disable-shout --disable-vorbis-encoder + --disable-httpd-output --disable-lame-encoder + --disable-twolame-encoder --disable-wave-encoder" + fi + + append-lfs-flags + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" + + econf \ + $(use_enable aac) \ + $(use_enable alsa) \ + $(use_enable ao) \ + $(use_enable audiofile) \ + $(use_enable bzip2) \ + $(use_enable cdio cdio-paranoia) \ + $(use_enable cdio iso9660) \ + $(use_enable curl) \ + $(use_enable debug) \ + $(use_enable ffmpeg) \ + $(use_enable fifo) \ + $(use_enable flac) \ + $(use_enable fluidsynth) \ + $(use_enable gme) \ + $(use_enable id3tag id3) \ + $(use_enable inotify) \ + $(use_enable ipv6) \ + $(use_enable jack) \ + $(use_enable lastfmradio lastfm) \ + $(use_enable libsamplerate lsr) \ + $(use_enable mad) \ + $(use_enable mikmod) \ + $(use_enable mms) \ + $(use_enable modplug) \ + $(use_enable mpg123) \ + $(use_enable musepack mpc) \ + $(use_enable openal) \ + $(use_enable oss) \ + $(use_enable pipe pipe-output) \ + $(use_enable pulseaudio pulse) \ + $(use_enable recorder recorder-output) \ + $(use_enable sid sidplay) \ + $(use_enable sndfile sndfile) \ + $(use_enable soundcloud) \ + $(use_enable soup) \ + $(use_enable sqlite) \ + $(use_enable systemd systemd-daemon) \ + $(use_enable tcpd libwrap) \ + $(use_enable vorbis) \ + $(use_enable wavpack) \ + $(use_enable wildmidi) \ + $(use_enable zip zzip) \ + $(use_with zeroconf zeroconf avahi) \ + "$(systemd_with_unitdir)" \ + ${mpdconf} +} + +src_install() { + emake DESTDIR="${D}" install + + insinto /etc + newins doc/mpdconf.dist mpd.conf + + newinitd "${FILESDIR}"/mpd.init mpd + + if use unicode; then + sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ + "${ED}"/etc/mpd.conf || die "sed failed" + fi + + use prefix || diropts -m0755 -o mpd -g audio + dodir /var/lib/mpd + keepdir /var/lib/mpd + dodir /var/lib/mpd/music + keepdir /var/lib/mpd/music + dodir /var/lib/mpd/playlists + keepdir /var/lib/mpd/playlists +} + +pkg_postinst() { + elog "If you will be starting mpd via /etc/init.d/mpd, please make" + elog "sure that MPD's pid_file is unset." + + # also change the homedir if the user has existed before + usermod -d "/var/lib/mpd" mpd +} diff --git a/media-sound/mpd/mpd-0.17.ebuild b/media-sound/mpd/mpd-0.17.ebuild deleted file mode 100644 index aaee3d69de14..000000000000 --- a/media-sound/mpd/mpd-0.17.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.17.ebuild,v 1.5 2012/07/29 18:31:47 armin76 Exp $ - -EAPI=4 -inherit eutils flag-o-matic linux-info multilib systemd user - -DESCRIPTION="The Music Player Daemon (mpd)" -HOMEPAGE="http://www.musicpd.org" -SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x64-macos" -IUSE="aac +alsa ao audiofile bzip2 cdio +curl debug +fifo +ffmpeg flac -fluidsynth +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad -mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder -sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack -wildmidi zeroconf zip" - -OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder" -INPUT_PLUGINS="aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 - musepack ogg flac sid vorbis wavpack wildmidi" -ENCODER_PLUGINS="audiofile flac lame twolame vorbis" - -REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} ) - || ( ${INPUT_PLUGINS} ) - network? ( || ( ${ENCODER_PLUGINS} ) ) - recorder? ( || ( ${ENCODER_PLUGINS} ) ) - lastfmradio? ( curl )" - -RDEPEND="!=media-sound/mpg123-1.12.2 ) - musepack? ( media-sound/musepack-tools ) - network? ( >=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - ogg? ( media-libs/libogg ) - openal? ( media-libs/openal ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplay:2 ) - sndfile? ( media-libs/libsndfile ) - soundcloud? ( >=dev-libs/yajl-2 ) - soup? ( net-libs/libsoup:2.4 ) - sqlite? ( dev-db/sqlite:3 ) - systemd? ( sys-apps/systemd ) - tcpd? ( sys-apps/tcp-wrappers ) - twolame? ( media-sound/twolame ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - - enewuser mpd "" "" "/var/lib/mpd" audio - - if use inotify; then - CONFIG_CHECK="~INOTIFY_USER" - ERROR_INOTIFY_USER="${P} requires inotify in-kernel support." - linux-info_pkg_setup - fi -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${PN}-0.16.conf.patch -} - -src_configure() { - local mpdconf="--disable-despotify --disable-documentation --disable-ffado - --disable-gme --disable-mvp --disable-roar --enable-largefile - --enable-tcp --enable-un --docdir=${EPREFIX}/usr/share/doc/${PF}" - - if use network; then - mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder) - --enable-httpd-output $(use_enable lame lame-encoder) - $(use_enable twolame twolame-encoder) - $(use_enable audiofile wave-encoder)" - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder - --disable-twolame-encoder --disable-wave-encoder" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_enable bzip2) \ - $(use_enable cdio cdio-paranoia) \ - $(use_enable cdio iso9660) \ - $(use_enable curl) \ - $(use_enable debug) \ - $(use_enable ffmpeg) \ - $(use_enable fifo) \ - $(use_enable flac) \ - $(use_enable fluidsynth) \ - $(use_enable id3tag id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable jack) \ - $(use_enable lastfmradio lastfm) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable mms) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable openal) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable pulseaudio pulse) \ - $(use_enable recorder recorder-output) \ - $(use_enable sid sidplay) \ - $(use_enable sndfile sndfile) \ - $(use_enable soundcloud) \ - $(use_enable soup) \ - $(use_enable sqlite) \ - $(use_enable systemd systemd-daemon) \ - $(use_enable tcpd libwrap) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - $(use_with zeroconf zeroconf avahi) \ - "$(systemd_with_unitdir)" \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /etc - newins doc/mpdconf.dist mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - "${ED}"/etc/mpd.conf || die "sed failed" - fi - - use prefix || diropts -m0755 -o mpd -g audio - dodir /var/lib/mpd - keepdir /var/lib/mpd - dodir /var/lib/mpd/music - keepdir /var/lib/mpd/music - dodir /var/lib/mpd/playlists - keepdir /var/lib/mpd/playlists -} - -pkg_postinst() { - elog "If you will be starting mpd via /etc/init.d/mpd, please make" - elog "sure that MPD's pid_file is unset." - - # also change the homedir if the user has existed before - usermod -d "/var/lib/mpd" mpd -} -- cgit v1.2.3-65-gdbad