From c4dd5a3331dc4752d47d790ed8806214baec1d23 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Fri, 14 Jan 2011 09:36:17 +0000 Subject: Add missing backslash on libwrap configure option. Remove affected ebuilds (Portage version: 2.2.0_alpha15/cvs/Linux x86_64) --- media-sound/mpd/ChangeLog | 8 +- media-sound/mpd/mpd-0.16.1-r1.ebuild | 177 +++++++++++++++++++++++++++++++++++ media-sound/mpd/mpd-0.16.1.ebuild | 177 ----------------------------------- media-sound/mpd/mpd-0.16.ebuild | 171 --------------------------------- 4 files changed, 184 insertions(+), 349 deletions(-) create mode 100644 media-sound/mpd/mpd-0.16.1-r1.ebuild delete mode 100644 media-sound/mpd/mpd-0.16.1.ebuild delete mode 100644 media-sound/mpd/mpd-0.16.ebuild (limited to 'media-sound/mpd') diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog index 1fb1f73eec7f..8f9339e919b0 100644 --- a/media-sound/mpd/ChangeLog +++ b/media-sound/mpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/mpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.236 2011/01/12 22:15:35 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.237 2011/01/14 09:36:17 hwoarang Exp $ + +*mpd-0.16.1-r1 (14 Jan 2011) + + 14 Jan 2011; Markos Chandras -mpd-0.16.ebuild, + -mpd-0.16.1.ebuild, +mpd-0.16.1-r1.ebuild: + Add missing backslash on libwrap configure option. Remove affected ebuilds *mpd-0.16.1 (12 Jan 2011) diff --git a/media-sound/mpd/mpd-0.16.1-r1.ebuild b/media-sound/mpd/mpd-0.16.1-r1.ebuild new file mode 100644 index 000000000000..ee9aeda9f0b9 --- /dev/null +++ b/media-sound/mpd/mpd-0.16.1-r1.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.1-r1.ebuild,v 1.1 2011/01/14 09:36:17 hwoarang Exp $ + +EAPI=2 +inherit eutils flag-o-matic linux-info multilib + +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 +id3 inotify ipv6 jack lame lastfmradio libmms libsamplerate +mad +mikmod modplug mpg123 musepack +network ogg oss pipe pulseaudio sid sqlite tcpd unicode +vorbis wavpack wildmidi zeroconf zip" + +RDEPEND="!sys-cluster/mpich2 + >=dev-libs/glib-2.6:2 + aac? ( >=media-libs/faad2-2 ) + alsa? ( media-sound/alsa-utils ) + ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] ) + audiofile? ( media-libs/audiofile ) + bzip2? ( app-arch/bzip2 ) + cdio? ( dev-libs/libcdio ) + cue? ( >=media-libs/libcue-0.13 ) + curl? ( net-misc/curl ) + ffmpeg? ( media-video/ffmpeg ) + flac? ( media-libs/flac[ogg?] ) + fluidsynth? ( media-sound/fluidsynth ) + network? ( >=media-libs/libshout-2 + !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) + id3? ( media-libs/libid3tag ) + jack? ( media-sound/jack-audio-connection-kit ) + lame? ( network? ( media-sound/lame ) ) + libmms? ( >=media-libs/libmms-0.4 ) + libsamplerate? ( media-libs/libsamplerate ) + mad? ( media-libs/libmad ) + mikmod? ( media-libs/libmikmod ) + modplug? ( media-libs/libmodplug ) + mpg123? ( media-sound/mpg123 ) + musepack? ( >=media-sound/musepack-tools-444 ) + ogg? ( media-libs/libogg ) + pulseaudio? ( media-sound/pulseaudio ) + sid? ( >=media-libs/libsidplay-2.1.1-r2:2 ) + sqlite? ( dev-db/sqlite:3 ) + tcpd? ( sys-apps/tcp-wrappers ) + vorbis? ( media-libs/libvorbis ) + wavpack? ( media-sound/wavpack ) + wildmidi? ( media-sound/wildmidi ) + zeroconf? ( net-dns/avahi[dbus] ) + zip? ( dev-libs/zziplib )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +pkg_setup() { + use network || ewarn "Icecast and Shoutcast streaming needs networking." + use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." + use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm" + 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-dependency-tracking --enable-tcp --enable-un + --disable-documentation --disable-ffado + --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)" + if ! use lame && ! use vorbis; then + ewarn "At least one encoder is required, enabling vorbis for you." + mpdconf+=" --enable-vorbis-encoder" + fi + else + mpdconf+=" --disable-shout --disable-vorbis-encoder + --disable-httpd-output --disable-lame-encoder" + fi + + if use flac && use ogg; then + mpdconf+=" --enable-oggflac" + else + mpdconf+=" --disable-oggflac" + fi + if use lastfmradio && use curl; then + mpdconf+=" --enable-lastfm" + else + mpdconf+=" --disable-lastfm" + fi + + append-lfs-flags + append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" + + cd "${S}" + + econf \ + $(use_enable aac) \ + $(use_enable alsa) \ + $(use_enable ao) \ + $(use_enable audiofile) \ + $(use_with zeroconf zeroconf avahi) \ + $(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 jack) \ + $(use_enable id3) \ + $(use_enable inotify) \ + $(use_enable ipv6) \ + $(use_enable libmms mms) \ + $(use_enable libsamplerate lsr) \ + $(use_enable mad) \ + $(use_enable mikmod) \ + $(use_enable modplug) \ + $(use_enable mpg123) \ + $(use_enable musepack mpc) \ + $(use_enable oss) \ + $(use_enable pipe pipe-output) \ + $(use_enable profile gprof) \ + $(use_enable pulseaudio pulse) \ + $(use_enable sid sidplay) \ + $(use_enable sqlite) \ + $(use_enable tcpd libwrap) \ + $(use_enable vorbis) \ + $(use_enable wavpack) \ + $(use_enable wildmidi) \ + $(use_enable zip zzip) \ + ${mpdconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + insinto /etc + newins doc/mpdconf.example mpd.conf + + newinitd "${FILESDIR}"/mpd.init mpd + + if use unicode; then + dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ + /etc/mpd.conf || die "dosed 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.1.ebuild b/media-sound/mpd/mpd-0.16.1.ebuild deleted file mode 100644 index 91b4b8627476..000000000000 --- a/media-sound/mpd/mpd-0.16.1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.1.ebuild,v 1.1 2011/01/12 22:15:35 hwoarang Exp $ - -EAPI=2 -inherit eutils flag-o-matic linux-info multilib - -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 +id3 inotify ipv6 jack lame lastfmradio libmms libsamplerate +mad -mikmod modplug mpg123 musepack +network ogg oss pipe pulseaudio sid sqlite tcpd unicode -vorbis wavpack wildmidi zeroconf zip" - -RDEPEND="!sys-cluster/mpich2 - >=dev-libs/glib-2.6:2 - aac? ( >=media-libs/faad2-2 ) - alsa? ( media-sound/alsa-utils ) - ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] ) - audiofile? ( media-libs/audiofile ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - cue? ( >=media-libs/libcue-0.13 ) - curl? ( net-misc/curl ) - ffmpeg? ( media-video/ffmpeg ) - flac? ( media-libs/flac[ogg?] ) - fluidsynth? ( media-sound/fluidsynth ) - network? ( >=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - id3? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - libmms? ( >=media-libs/libmms-0.4 ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod ) - modplug? ( media-libs/libmodplug ) - mpg123? ( media-sound/mpg123 ) - musepack? ( >=media-sound/musepack-tools-444 ) - ogg? ( media-libs/libogg ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( >=media-libs/libsidplay-2.1.1-r2:2 ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( sys-apps/tcp-wrappers ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm" - 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-dependency-tracking --enable-tcp --enable-un - --disable-documentation --disable-ffado - --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)" - if ! use lame && ! use vorbis; then - ewarn "At least one encoder is required, enabling vorbis for you." - mpdconf+=" --enable-vorbis-encoder" - fi - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder" - fi - - if use flac && use ogg; then - mpdconf+=" --enable-oggflac" - else - mpdconf+=" --disable-oggflac" - fi - if use lastfmradio && use curl; then - mpdconf+=" --enable-lastfm" - else - mpdconf+=" --disable-lastfm" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - cd "${S}" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_with zeroconf zeroconf avahi) \ - $(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 jack) \ - $(use_enable id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable libmms mms) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable profile gprof) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sqlite) \ - $(use_enable tcpd libwrap) - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - insinto /etc - newins doc/mpdconf.example mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - /etc/mpd.conf || die "dosed 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.ebuild b/media-sound/mpd/mpd-0.16.ebuild deleted file mode 100644 index 3be75abd0b1d..000000000000 --- a/media-sound/mpd/mpd-0.16.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.ebuild,v 1.6 2011/01/05 21:49:55 hwoarang Exp $ - -EAPI=2 -inherit eutils flag-o-matic multilib - -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 +id3 inotify ipv6 jack lame lastfmradio libmms libsamplerate +mad -mikmod modplug mpg123 musepack +network ogg oss pipe pulseaudio sid sqlite tcpd unicode -vorbis wavpack wildmidi zeroconf zip" - -RDEPEND="!sys-cluster/mpich2 - >=dev-libs/glib-2.6:2 - aac? ( >=media-libs/faad2-2 ) - alsa? ( media-sound/alsa-utils ) - ao? ( >=media-libs/libao-0.8.4[alsa?,pulseaudio?] ) - audiofile? ( media-libs/audiofile ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - cue? ( >=media-libs/libcue-0.13 ) - curl? ( net-misc/curl ) - ffmpeg? ( media-video/ffmpeg ) - flac? ( media-libs/flac[ogg?] ) - fluidsynth? ( media-sound/fluidsynth ) - network? ( >=media-libs/libshout-2 - !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) - id3? ( media-libs/libid3tag ) - jack? ( media-sound/jack-audio-connection-kit ) - lame? ( network? ( media-sound/lame ) ) - libmms? ( >=media-libs/libmms-0.4 ) - libsamplerate? ( media-libs/libsamplerate ) - mad? ( media-libs/libmad ) - mikmod? ( media-libs/libmikmod ) - modplug? ( media-libs/libmodplug ) - mpg123? ( media-sound/mpg123 ) - musepack? ( >=media-sound/musepack-tools-444 ) - ogg? ( media-libs/libogg ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( >=media-libs/libsidplay-2.1.1-r2:2 ) - sqlite? ( dev-db/sqlite:3 ) - tcpd? ( sys-apps/tcp-wrappers ) - vorbis? ( media-libs/libvorbis ) - wavpack? ( media-sound/wavpack ) - wildmidi? ( media-sound/wildmidi ) - zeroconf? ( net-dns/avahi[dbus] ) - zip? ( dev-libs/zziplib )" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -pkg_setup() { - use network || ewarn "Icecast and Shoutcast streaming needs networking." - use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream." - use lastfmradio && ! use curl && ewarn "Lastfm requires curl support. Disabling lastfm" - enewuser mpd "" "" "/var/lib/mpd" audio -} - -src_prepare() { - cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed" - epatch "${FILESDIR}"/${P}.conf.patch -} - -src_configure() { - local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un - --disable-documentation --disable-ffado - --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)" - if ! use lame && ! use vorbis; then - ewarn "At least one encoder is required, enabling vorbis for you." - mpdconf+=" --enable-vorbis-encoder" - fi - else - mpdconf+=" --disable-shout --disable-vorbis-encoder - --disable-httpd-output --disable-lame-encoder" - fi - - if use flac && use ogg; then - mpdconf+=" --enable-oggflac" - else - mpdconf+=" --disable-oggflac" - fi - if use lastfmradio && use curl; then - mpdconf+=" --enable-lastfm" - else - mpdconf+=" --disable-lastfm" - fi - - append-lfs-flags - append-ldflags "-L/usr/$(get_libdir)/sidplay/builders" - - cd "${S}" - - econf \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ao) \ - $(use_enable audiofile) \ - $(use_with zeroconf zeroconf avahi) \ - $(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 jack) \ - $(use_enable id3) \ - $(use_enable inotify) \ - $(use_enable ipv6) \ - $(use_enable libmms mms) \ - $(use_enable libsamplerate lsr) \ - $(use_enable mad) \ - $(use_enable mikmod) \ - $(use_enable modplug) \ - $(use_enable mpg123) \ - $(use_enable musepack mpc) \ - $(use_enable oss) \ - $(use_enable pipe pipe-output) \ - $(use_enable profile gprof) \ - $(use_enable pulseaudio pulse) \ - $(use_enable sid sidplay) \ - $(use_enable sqlite) \ - $(use_enable tcpd libwrap) - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_enable wildmidi) \ - $(use_enable zip zzip) \ - ${mpdconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - insinto /etc - newins doc/mpdconf.example mpd.conf - - newinitd "${FILESDIR}"/mpd.init mpd - - if use unicode; then - dosed 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \ - /etc/mpd.conf || die "dosed 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 -} -- cgit v1.2.3-65-gdbad