version bump. remove old ebuilds

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 26 insertions, 195 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 3e1f99c80068..5247f2343520 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.272 2011/11/05 21:22:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.273 2011/12/04 13:01:02 hwoarang Exp $
+
+*mpd-0.16.6 (04 Dec 2011)
+
+  04 Dec 2011; Markos Chandras <hwoarang@gentoo.org> +mpd-0.16.6.ebuild,
+  -mpd-0.16.4.ebuild, -mpd-0.16.3-r1.ebuild:
+  version bump. remove old ebuilds
 
   05 Nov 2011; Markus Meier <maekke@gentoo.org> mpd-0.16.5.ebuild:
   arm stable, bug #388369
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 4d92a140e932..07b66d4f2478 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd-0.16.3-ffmpeg.patch 800 RMD160 984a98f5f7bd6a412ebb993ac2be6765f94424c9 SHA1 802ee8a3f598d82538b68674af0f82150bf1c52d SHA256 b3958db44146f11bc1f99410284c30a2739915591e92704ed83ea389c222a121
@@ -9,20 +9,28 @@ AUX mpd.conf.patch 2566 RMD160 50cb8539749355f610b82b527ed1438f1e5d64b0 SHA1 82c
 AUX mpd.init 824 RMD160 e58cc1644628fb931f5d8bd5726fdceebd29493d SHA1 72377bfa801f6bbcc5474c725303fd234a6bc148 SHA256 a6565c16ffd8ee69d63ead18c967e05abcab2eb64d9810c9f4711aef358cc048
 AUX mpd.rc 672 RMD160 278e4f59433656b930a9f35e59747681a2e4918d SHA1 06cf045b9d994aff0653f085761871e44fe3aebc SHA256 6b0c65dc4394108b3720afdc865f8692aa80c94ed12f351dce5f11537ffd84a8
 DIST mpd-0.16.2.tar.bz2 478096 RMD160 74e63fe4514eb8309bf2b2e4e4012566e14b6262 SHA1 ce0b8cd473f8acb45c06d73f41c18fc4dabbe440 SHA256 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5
-DIST mpd-0.16.3.tar.bz2 477517 RMD160 860a308ec443896da43c7421db8895c5aff9bd91 SHA1 7990bad609064752175127527fcf2ecf8066e36f SHA256 58df79cfa89b365413ee720f3f605ff01a9aa32be1e176d523243954648731d2
-DIST mpd-0.16.4.tar.bz2 478807 RMD160 2e06445ea09c30b0ae63c33b85875114008fd13c SHA1 b4eb52903f269e18f434ca5fc346be281ba22c4f SHA256 fa85ca6f837bdfa5ac165c674c2d8cdb77ff44b5f56fac526bc6a11211e61cfd
 DIST mpd-0.16.5.tar.bz2 498034 RMD160 05563d4b72016a3adb0b1ddf5536c26df1213cad SHA1 d04b9726a9bd39451428c7c945dd30e8b552d70c SHA256 1a03ba9fd38230d79be5ee7d2b75ffeae01d738613866cdf23e74a1e1e9b73db
+DIST mpd-0.16.6.tar.bz2 486442 RMD160 5a54c17f7fae46b7e30afefdcc68c1b23b23f511 SHA1 235e34a27cfa5fbf5849eb1be32e441d34c3a139 SHA256 6ec5ad3fdeeb97608e40e041b6a458c61afd023a0fd1eeb464e208fcd36659df
 EBUILD mpd-0.16.2.ebuild 5426 RMD160 26c1acc62728eeb9102dee0f63ef7b3f26656088 SHA1 0cc36c588c3026ddd02252c2de8abfaf20077540 SHA256 9e80b9113e43090b2eb01fa501c4220367fa738558040059a74c05e2b9175c86
-EBUILD mpd-0.16.3-r1.ebuild 5472 RMD160 8241721e65c37bd0a211c18327facec83f299ec7 SHA1 cc6f0c0ed19840b23f8e1ba8444ad88692f03ca2 SHA256 f7dad7bb1a5c722fabfe3e1a50ba7a41012af1149a35060198535575d4c36b09
-EBUILD mpd-0.16.4.ebuild 5478 RMD160 66cd2551048d80dae3052d075adb16e3dbeb5022 SHA1 223ead02d3ba201349fc4757aca87abd3625d834 SHA256 7ca60ee177746e36dfc977b7e98dfdb736a7a890a7c32a520cd7dc115808827a
 EBUILD mpd-0.16.5.ebuild 5428 RMD160 a91b27a6ab30d2d870b486dd2b54683fedd82a73 SHA1 b6cc0d70e16b38055c8c557c920633aa04979ad4 SHA256 67c8cfcbf9910d5cbb077a8905fe71d6a5c42dd1859e07f3e3d8650c529f1c3f
+EBUILD mpd-0.16.6.ebuild 5434 RMD160 56bca75553dffe04e1bd5ba1e5e14e41418b32cf SHA1 f9b6d603de6f33d7406d6367ab072f3da81095e2 SHA256 10cf6fc9ac3098df2da80758b84d56366c37b95006ed39a59c9b3dea4b34dbb2
 EBUILD mpd-9999.ebuild 5492 RMD160 9cdc4093fd888d445f1b5c63c0cdf41a5a644c3d SHA1 8eb1ee71a902e8c663c8ef36da8c003ee9c2f321 SHA256 0b3f2c11cb59b7027e489035222fe0e9e77451b902b75e0f7714b7ccead95df4
-MISC ChangeLog 39228 RMD160 04c8937145397a30a059f24d29860826e99cd3c1 SHA1 b4a50596ccb5e7f9cf0ed6fc7d1587cf1fd51bf3 SHA256 7e8347b93ac1cdd099f3db83e719e68f76431a21ac54a8b0cb83dae19bc237ed
+MISC ChangeLog 39411 RMD160 bb49a50656d9c99f125a8e36be41405d295ffcf7 SHA1 0ebe105869672a70c47a9c045f18d1d9434218e3 SHA256 cb85fb6ec8a7cf4d97a488afcc39ca65d5c8ea2910c5a8e7d4d9c11d2ebccbc8
 MISC metadata.xml 1434 RMD160 170e2d23e96fb26f832a6fa64d77f9260326e62b SHA1 02b0ce06f5fea588ed924a837d1d375fe7f2a8e9 SHA256 781c3f6bdd130a2638b390f513395447500d609682750748c13b8a7cd9d17034
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk61qYgACgkQkKaRLQcq0GKxNACdHT4chib+UNbFmPPSCnwE4daU
-ufUAn1cFlcTT2YWHvOQRkie6xQFcoTeR
-=wfXm
+iQIcBAEBCgAGBQJO228PAAoJEPqDWhW0r/LCYSIP/jFBa+tNgq88NqD2qiusGYRc
+aqpgAVsMNb6sX7A6V6rE3H+3JW/JWa7VUuZNXQ+bQ1ynGkeyAhs1HPq3LrFztkmW
+CM40i0GOZgryjkRFUJIAUkKeMRAJ3Iiwp7/bGj2LtklJ7kVOL2JvdKucXq3tGVTe
+labAbUYQjz/wDGOL1wxOM5xxJdK3yVYxK891OmRAlfrKZEkjFiuJyAE6EL368xIi
+whqZyOpi+D4laPmRRNjwtVJM1G1JLc1TtRGdV43AXIheaMHNb9MLa8QO0vKiiknS
+RD1YpTv2dCqBnNx65+u1PjsbjqfRxeshadiF84ImRf4sHg/hVjDS+l4HbYIfsULj
+HCwL5kLnSmXyZDjsJ5cpBT0WimZdwf+Xwz0VPg+/x/2vrf5lP4eTYiTOlWu0VBSV
+PfKwcDkBSuCsJDJ5JIlGEuboGsWg4/RzS0G/0fQ4oRerPlFUppC7zO0ECZcKc34c
+38VATj8XAir7CwJ9+qvHU0+ZDShZfFiLjDkyYiAODIdfHmJ8uGuUEbekcR1hE2+3
+NV+mgqADng1K0TNm414Jy/HR0394vSo70J3BFaxkaupDWr7IuQa980ABZOof9/sI
+D8f8QJfVlvb8ZwXq/y8vKhJwRuVGdcsUIzXPANHz8XZLtpUu/EGjY1cZQspf2L9s
+8zrXMetM7uA+yUhS1q4a
+=H3/H
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.16.4.ebuild b/media-sound/mpd/mpd-0.16.4.ebuild
deleted file mode 100644
index 474fa7e7ff75..000000000000
--- a/media-sound/mpd/mpd-0.16.4.ebuild
+++ /dev/null
@@ -1,182 +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.4.ebuild,v 1.3 2011/09/17 00:26:14 radhermit Exp $
-
-EAPI=4
-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 +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="!<sys-cluster/mpich2-1.4_rc2
-	dev-libs/glib:2
-	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils )
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	ffmpeg? ( virtual/ffmpeg )
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	network? ( >=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 )
-	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}
-	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
-
-	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}-include-stdio.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.3-r1.ebuild b/media-sound/mpd/mpd-0.16.6.ebuild
index 0037769db89c..7856a88a94d8 100644
--- a/media-sound/mpd/mpd-0.16.3-r1.ebuild
+++ b/media-sound/mpd/mpd-0.16.6.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.2 2011/07/17 16:08:37 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.6.ebuild,v 1.1 2011/12/04 13:01:02 hwoarang Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -79,8 +79,7 @@ pkg_setup() {
 
 src_prepare() {
 	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch
 }
 
 src_configure() {