Version bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index b41456a1ea9caf4044e525cc0861af346f84872d..8402954e1310b0dd939791f30cfc1eb783f3e6ab 100644 (file)
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.203 2010/05/18 17:52:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.204 2010/05/31 19:23:17 angelos Exp $
+
+*mpd-0.15.10 (30 May 2010)
+
+  30 May 2010; Christoph Mende <angelos@gentoo.org> +mpd-0.15.10.ebuild:
+  Version bump
 
   18 May 2010; Christoph Mende <angelos@gentoo.org> -mpd-0.15.ebuild,
   -mpd-0.15.3.ebuild, -mpd-0.15.5.ebuild, -mpd-0.15.6.ebuild:

diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 195db0fa036125a09eb44a6deef6cc787bb0f791..8a37e2eea2be217d313add962b6744de40e98e80 100644 (file)
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8
+DIST mpd-0.15.10.tar.bz2 390045 RMD160 853732cdba27e83235cd359cdd5a3caf30e64649 SHA1 ff77af4a9609162b1285abd58500435dc499f024 SHA256 fabb48214e27bfaa2bc29c2ad56b5835fc9572951106ae77bb481e892bfc423a
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
 DIST mpd-0.15.9.tar.bz2 390141 RMD160 566440dbc16ac46f20d8d11bfe09ffe43423eb34 SHA1 9dbef302ef44372f2232c1df1af2f3a958ff601d SHA256 4a57a1a0dc71606d0db926b67d5b2c1ed2bfaf94baca7889d4b994a37bf367bb
+EBUILD mpd-0.15.10.ebuild 4856 RMD160 f29d15928d045d01e082bfd779a627e824ac150a SHA1 1919f9748f195d11a931de60d584bfcc82704248 SHA256 058c537587cce8d3248ed025ae13448065d349c34a24466f443a31b18e2d67b8
 EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e
 EBUILD mpd-0.15.9.ebuild 4855 RMD160 9da20eabc1e9701e3fa28dc853450ce4bd229b8d SHA1 c865262ae66b18c3220317a6b012fce9c752a654 SHA256 43c7e2d1796f28a3dee972afb71e9592c29ea1639c849080007f71a09e7d7e7c
-MISC ChangeLog 30108 RMD160 bc2bfa128106ce03ed44d76ee8ff40a7f6feb365 SHA1 6909fc3e17d0f541ada54c09230b8f1de34ec668 SHA256 0283454c78f9ff31237572d4183ec19ec9bc107e1e76888a49bd0fc4a2d06a7b
+MISC ChangeLog 30225 RMD160 a2696a35b091070ff8ec21684c1530c47e6871d7 SHA1 b59a0b7ec42e2273706c7ae78e327a0efad77033 SHA256 96e5a1d5d2da9c9649db1a2c7874dcaf2e05f37f77bbe18d2cf0f50eecbfaed8
 MISC metadata.xml 1102 RMD160 88cdb7b7217f759eb993ff82589c74115213add4 SHA1 3ddf0689c3e5d2afc7371cad27c7f873aab5cb9f SHA256 4fe3d580f53a860190580caad66ed95ca02f05ea21228983d83ca26418410206
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkv9X84ACgkQmWq1bYTyC0OhawD/fWI8J6P8rVkIGnqbAnD08awO
-m/u1wajiFLB7k5D0ntoBAJR0GAvPN0LhwcjML+VwWgOYjEtFtyVJj5iN9vwq5NCT
-=8y5G
+iF4EAREIAAYFAkwEDLkACgkQmWq1bYTyC0N62QEAiIkFxt3Mq4QAHEzYI9z8Hprr
+98TNzTtGwgjksDtd75AA/jKrOhyrrr7i7luxx3WGACNFUnX/2JI4LnUYWxiTr28x
+=vAhf
 -----END PGP SIGNATURE-----

diff --git a/media-sound/mpd/mpd-0.15.10.ebuild b/media-sound/mpd/mpd-0.15.10.ebuild
new file mode 100644 (file)
index 0000000..1ef3d33
--- /dev/null
+++ b/media-sound/mpd/mpd-0.15.10.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.10.ebuild,v 1.1 2010/05/31 19:23:17 angelos 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 avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
+fluidsynth profile +id3 ipv6 jack lame lastfmradio libmms libsamplerate +mad
+mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
+vorbis wavpack 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 )
+       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 )
+       vorbis? ( media-libs/libvorbis )
+       wavpack? ( media-sound/wavpack )
+       avahi? ( net-dns/avahi )
+       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."
+
+       enewuser mpd "" "" "/var/lib/mpd" audio
+}
+
+src_prepare() {
+       cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+       epatch "${FILESDIR}"/0.15.1-mpdconf.patch
+}
+
+src_configure() {
+       local mpdconf="--disable-dependency-tracking --enable-tcp --enable-un
+               --disable-wildmidi --disable-libOggFLACtest --disable-documentation
+               --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
+
+       append-lfs-flags
+       append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+       cd "${S}"
+
+       econf \
+               $(use_enable ipv6) $(use_enable cue) \
+               $(use_enable sqlite) $(use_enable curl) \
+               $(use_enable lastfmradio lastfm) $(use_enable libmms mms) \
+               $(use_enable bzip2) $(use_enable zip) \
+               $(use_enable cdio iso9660) $(use_enable id3) \
+               $(use_enable audiofile) $(use_enable ffmpeg) \
+               $(use_enable flac) $(use_enable mad) \
+               $(use_enable mikmod) $(use_enable modplug) \
+               $(use_enable musepack mpc) $(use_enable vorbis) \
+               $(use_enable sid sidplay) $(use_enable fluidsynth) \
+               $(use_enable wavpack) $(use_enable libsamplerate lsr) \
+               $(use_enable alsa) $(use_enable ao) \
+               $(use_enable fifo) $(use_enable pipe pipe-output) \
+               $(use_enable jack) $(use_enable oss) \
+               $(use_enable pulseaudio pulse) $(use_enable aac) \
+               $(use_enable debug) $(use_enable profile gprof) \
+               $(use_with avahi zeroconf avahi) \
+               ${mpdconf}
+}
+
+src_install() {
+       dodir /var/run/mpd
+       fowners mpd:audio /var/run/mpd
+       fperms 750 /var/run/mpd
+       keepdir /var/run/mpd
+
+       emake DESTDIR="${D}" install || die "emake install failed"
+
+       insinto /etc
+       newins doc/mpdconf.example mpd.conf
+
+       newinitd "${FILESDIR}"/mpd.rc 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
+       dodir /var/log/mpd
+       keepdir /var/log/mpd
+
+       if use alsa; then
+               dosed 's:need :need alsasound :' /etc/init.d/mpd || die "dosed failed"
+       fi
+}
+
+pkg_postinst() {
+       elog "If you will be starting mpd via /etc/init.d/mpd, please make"
+       elog "sure that MPD's pid_file is set to /var/run/mpd/mpd.pid."
+
+       # also change the homedir if the user has existed before
+       usermod -d "/var/lib/mpd" mpd
+}