Add missing backslash on libwrap configure option. Remove affected ebuilds

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

4 files changed, 14 insertions, 181 deletions

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 <hwoarang@gentoo.org> -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/Manifest b/media-sound/mpd/Manifest
index 4a6d21efd0fa..388865869aea 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -13,21 +13,19 @@ DIST mpd-0.15.15.tar.bz2 391688 RMD160 16b6196f698f0442ad6d76b7a03f06f0dcc5a245
 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
 DIST mpd-0.16.1.tar.bz2 480244 RMD160 f96ecb6a337043ea4982a2fa609d026b0d571647 SHA1 328d6d1e118e7d0029535559b2ae87ac10b79d6e SHA256 b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
-DIST mpd-0.16.tar.bz2 479757 RMD160 acc2f53f160dedb5222c0dea75afbffad95d46c2 SHA1 ab2fc09474501b5b9396a359027ca4f1ebbd4aa5 SHA256 e2ad191540f204fb165735b1f896e0aeb632c5021fd2038450e6e2ca93cac06b
 EBUILD mpd-0.15.10.ebuild 4856 RMD160 f29d15928d045d01e082bfd779a627e824ac150a SHA1 1919f9748f195d11a931de60d584bfcc82704248 SHA256 058c537587cce8d3248ed025ae13448065d349c34a24466f443a31b18e2d67b8
 EBUILD mpd-0.15.12-r2.ebuild 4662 RMD160 b029a3897719cc08a515b879427792951877943c SHA1 727c82cf181898cf5dd84c976db46cef20d56d00 SHA256 97c6a35bef3b53070088c061e6d4786e98ef1f53d80a17fabaae50db8a6728c1
 EBUILD mpd-0.15.13.ebuild 4650 RMD160 8143fad65d5f43eed5aa0d2121689f1c16b1b69a SHA1 99d46cf82de586e48665549dcb2c72be47975b58 SHA256 237f07be37886ad13b203dbfe2e21164e4b2e2f6329fb43e32c8403fb8b9d338
 EBUILD mpd-0.15.15.ebuild 4811 RMD160 5d07d81ddbdcea0338df757eecd9955ff34d8a8c SHA1 41c0f95e3c7a5562e75e9b03fdd10019e38caff1 SHA256 646f6b819c080188a15539c9abd2ab3b24d124e3c451cdfb5c3ad87f00062ea3
 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
-EBUILD mpd-0.16.1.ebuild 5207 RMD160 a8427dbf5aa01150fa4291f4068e19e71d745342 SHA1 f5fc563ac8c1db5598df1d41adfcae4ed873274a SHA256 17fbc07904d8aa0d802ea4368d0c973f48d685b76b86bd3d8951dd79ca893078
-EBUILD mpd-0.16.ebuild 5043 RMD160 dfae51075e7a2f83b01fa1f7a575362b5780bdb3 SHA1 47bd0e1f9b95293b86a3dbe5f1b5d8a7736f8719 SHA256 d0c6e2109123d69fea5a28e43a38b5ff1351e607bb687a8c168eeef94f273b27
-MISC ChangeLog 34437 RMD160 fb8c060d11d65ef4c57c2bf72f85ab774353b6c2 SHA1 d54468b66824fb4bb692480d3d662572fccb0d98 SHA256 5b88b712f1187d2ccc95a33cdc096da217e0e12b0205ced8981e168b5250fcca
+EBUILD mpd-0.16.1-r1.ebuild 5212 RMD160 195e74c78a11b19437b34d0980d0f5b95d79a1b6 SHA1 67471c4a459e5efb5023167565c3f2cc559cc677 SHA256 d9c20bbfd3b990f3429e772f627eb43d217e777d2dbb05408ef049a562bca704
+MISC ChangeLog 34661 RMD160 da6ad3c6e686e5c4fa8095c2fe962f24780ad788 SHA1 78cd9a81cd1651cc5acc7370dd7d379452e69ac8 SHA256 e475be3622fbf5c6755e1c09b6f9df0b14d0e406a6dfd7b9c3bfd4d5a2a3e801
 MISC metadata.xml 1459 RMD160 8c586d2fd713d9d43b21016e53aa1c6fe2037609 SHA1 5c8fa337495549bb88db2db19c80fd2b16091a7d SHA256 17360565f5af1ce4bd3010c915498eddcec2af29e6a290ec3b98d5c96247d1ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0uJ6MACgkQ9/cejkQaxBDkFACfZLcFGWLo08tnnHB19iaC9Nxq
-lPAAnA2BD+cecKGEJkjR/kHSYadZXOeg
-=orMG
+iEYEARECAAYFAk0wGQkACgkQ9/cejkQaxBCW3ACeP4fG0w3B+HaztnD5UuFDnWUX
+WKIAnRFU5lyL3zS8Hbhds3alBlS1GiFW
+=GOUo
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.16.1.ebuild b/media-sound/mpd/mpd-0.16.1-r1.ebuild
index 91b4b8627476..ee9aeda9f0b9 100644
--- a/media-sound/mpd/mpd-0.16.1.ebuild
+++ b/media-sound/mpd/mpd-0.16.1-r1.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.1.ebuild,v 1.1 2011/01/12 22:15:35 hwoarang Exp $
+# $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
@@ -138,7 +138,7 @@ src_configure() {
 		$(use_enable pulseaudio pulse) \
 		$(use_enable sid sidplay) \
 		$(use_enable sqlite) \
-		$(use_enable tcpd libwrap)
+		$(use_enable tcpd libwrap) \
 		$(use_enable vorbis) \
 		$(use_enable wavpack) \
 		$(use_enable wildmidi) \
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
-}