Version bump wrt #211805, thanks to Hendrik Iben.

Package-Manager: portage-2.1.4.4

7 files changed, 78 insertions, 448 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index bb8ddb1791b2..3078c7abb2b3 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/moc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.46 2007/12/05 15:47:26 fmccor Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.47 2008/03/01 10:21:00 drac Exp $
+
+*moc-2.5.0_alpha3 (01 Mar 2008)
+
+  01 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  -files/moc-2.4.1+flac-1.1.3.patch, -moc-2.4.1.ebuild, -moc-2.4.2.ebuild,
+  +moc-2.5.0_alpha3.ebuild:
+  Version bump wrt #211805, thanks to Hendrik Iben.
 
   05 Dec 2007; Ferris McCormick <fmccor@gentoo.org> moc-2.5.0_alpha2.ebuild:
   Sparc stable --- Bug #200134 --- works fine.
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index af15220a2f75..1fce6cd52fe2 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,10 +1,7 @@
-AUX moc-2.4.1+flac-1.1.3.patch 9407 RMD160 ebb75d57339ac06e471ac458cacb8ee66e06a242 SHA1 4bc86b8676bee1a53e99da5b3752a5601834231d SHA256 488245b26d2b4e1ae4480882f67762a0a7a7708103368b2116cde4788ef8c826
 AUX moc-2.5.0_alpha2-endianess.patch 1747 RMD160 6b284b59d461aba3b3248b78cee7a4c576b9d67d SHA1 4a26b7f6b488f7781ba18a1423dadc0d74a6d8b7 SHA256 b6874f79f454a430dc96705b54048ee999576e8327436ca9ef1654b72bb5f28f
-DIST moc-2.4.1.tar.bz2 439866 RMD160 206d8342e331bf4f918069de4e797310a4adc2fb SHA1 63923cd7ff0f144d5a7baed7b55e3790da05134c SHA256 0f4ef44e86b7edb4ee910f8b5c02efa59985ab1a0cf2f57497c71a2932699d28
-DIST moc-2.4.2.tar.bz2 459922 RMD160 3643cf48ac2ece4e91242196ef17e7bcc33a73ff SHA1 a5421c0d900a856cc5ce45879305116e515faaec SHA256 7149cdff6a52fc8c9f0c3c1abfae81473c7fecb7b660247f4820301204a09341
 DIST moc-2.5.0-alpha2.tar.bz2 486681 RMD160 64efd4bff599ae419dad34905725db38633ec8c9 SHA1 9d448c79ad0889cc5a27c5d9e1bbe7b6a697954f SHA256 000deb3212a70fe4b83e4f005753746e80fdc7d5b74db89b8a6cf69410c455a3
-EBUILD moc-2.4.1.ebuild 1814 RMD160 55f1bcaa887f65b855a8929f1b4f84f84fee5327 SHA1 9cba150bb8c03a7ff5067faa469081cc2a1c6712 SHA256 7895fe184cfa3dafebf3a19707ee3a4273ba3e50043509de5369d59353328dac
-EBUILD moc-2.4.2.ebuild 1731 RMD160 9dbb1e5b0b9c56b0758855f3bc9f9e68b5ff1067 SHA1 9fdf76ffafb78cba635adfc38d8eabed1e4c9322 SHA256 75af603861fe4019518d314ced247f4f0cf340bdde7839e3d5d70c991c0447e2
-EBUILD moc-2.5.0_alpha2.ebuild 2045 RMD160 ef56f0f2a6f26fcf19def209a703fcb9d92bc1a1 SHA1 0556f66c612c2e32f2fc9724286c585c4d691f37 SHA256 66e9f47db7ba0ebfaa2f7ff4b4c90d2afe3a408e9178f41be3a95330641e355a
-MISC ChangeLog 6468 RMD160 11ef01dde0ce13e6fd3a867320e6da9ab6adba66 SHA1 f53c9fd0627159e7c725f289d330448485a9b982 SHA256 b7196e614c5b8bf037e501b2ff0b951b92d4ca9d8984a5279fde5edcbf1a81f0
+DIST moc-2.5.0-alpha3.tar.bz2 489824 RMD160 7a603538e2080f3e182a543bc82100a09a56c2fe SHA1 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 SHA256 6b691295eb0b42aab17805798bd40fb308619a9ba8f6a1e1ed599e3449946617
+EBUILD moc-2.5.0_alpha2.ebuild 2042 RMD160 b6d43919bad24a254fa452317a74e44291271b04 SHA1 8c1588a576b9c5952e42525f04b1139575dc1a6d SHA256 eb844976f867392e231e1e4c8859e4a5f8eb4d9aa990b306eb2dd446eb3d5b8e
+EBUILD moc-2.5.0_alpha3.ebuild 2011 RMD160 2ca4a5495b8097e10dcd82d09a9a1ac1c827307a SHA1 49313c809317b54ae2d624b110325df75104b517 SHA256 950ae9554e3611f14aa78e8be922d709613dbfc6f8029c821069ac90fa11c854
+MISC ChangeLog 6704 RMD160 bbe75a36892549ba8b65cb058248e90dd0033624 SHA1 cfa7614707756b5f6d12f8dece918a2a1bc8b77a SHA256 59aa0037653a60d5812a6f3f80b5c59c5649918db2c87f409d9dc29bdc7d4e91
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/moc/files/moc-2.4.1+flac-1.1.3.patch b/media-sound/moc/files/moc-2.4.1+flac-1.1.3.patch
deleted file mode 100644
index 176db8d9e0fe..000000000000
--- a/media-sound/moc/files/moc-2.4.1+flac-1.1.3.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-diff -ru moc-2.4.1/configure moc-2.4.1-b2/configure
---- moc-2.4.1/configure	2006-10-08 08:38:06.000000000 -0700
-+++ moc-2.4.1-b2/configure	2006-10-31 00:22:00.000000000 -0800
-@@ -30698,7 +30698,7 @@
-     LIBFLAC_LIBS="-L$libdir"
-   fi
- 
--  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
-+  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
- 
-   if test "x$libFLAC_includes" != "x" ; then
-     LIBFLAC_CFLAGS="-I$libFLAC_includes"
-diff -ru moc-2.4.1/decoder_plugins/flac/flac.c moc-2.4.1-b2/decoder_plugins/flac/flac.c
---- moc-2.4.1/decoder_plugins/flac/flac.c	2006-02-12 03:55:10.000000000 -0800
-+++ moc-2.4.1-b2/decoder_plugins/flac/flac.c	2006-10-31 00:23:55.000000000 -0800
-@@ -28,6 +28,13 @@
- #include "log.h"
- #include "io.h"
- 
-+/* by LEGACY_FLAC we mean pre-1.1.3, before FLAC__SeekableStreamDecoder was merged into FLAC__StreamDecoder */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- #define MAX_SUPPORTED_CHANNELS		2
- 
- #define SAMPLES_PER_WRITE		512
-@@ -35,7 +42,11 @@
- 
- struct flac_data
- {
-+#ifdef LEGACY_FLAC
- 	FLAC__SeekableStreamDecoder *decoder;
-+#else
-+	FLAC__StreamDecoder *decoder;
-+#endif
- 	struct io_stream *stream;
- 	int bitrate;
- 	int abort; /* abort playing (due to an error) */
-@@ -109,7 +120,11 @@
- }
- 
- static FLAC__StreamDecoderWriteStatus write_callback (
-+#ifdef LEGACY_FLAC
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- 		const FLAC__Frame *frame,
- 		const FLAC__int32 * const buffer[], void *client_data)
- {
-@@ -127,7 +142,11 @@
- }
- 
- static void metadata_callback (
-+#ifdef LEGACY_FLAC
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- 		const FLAC__StreamMetadata *metadata, void *client_data)
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
-@@ -147,7 +166,11 @@
- }
- 
- static void error_callback (
-+#ifdef LEGACY_FLAC
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- 		FLAC__StreamDecoderErrorStatus status, void *client_data)
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
-@@ -160,9 +183,15 @@
- 		decoder_error (&data->error, ERROR_FATAL, 0, "FLAC: lost sync");
- }
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderReadStatus read_callback (
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- 		FLAC__byte buffer[], unsigned *bytes, void *client_data)
-+#else
-+static FLAC__StreamDecoderReadStatus read_callback (
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+		FLAC__byte buffer[], size_t *bytes, void *client_data)
-+#endif
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
- 	ssize_t res;
-@@ -171,52 +200,97 @@
- 
- 	if (res > 0) {
- 		*bytes = res;
-+#ifdef LEGACY_FLAC
-+		return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
-+#else
- 		return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-+#endif
- 	}
- 	
- 	if (res == 0) {
- 		*bytes = 0;
-+		/* not sure why this works, but if it ain't broke... */
- 		return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
- 	}
- 
- 	error ("read error: %s", io_strerror(data->stream));
- 
-+#ifdef LEGACY_FLAC
-+	return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
-+#else
- 	return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-+#endif
- }
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderSeekStatus seek_callback (
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- 		FLAC__uint64 absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamDecoderSeekStatus seek_callback (
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+		FLAC__uint64 absolute_byte_offset, void *client_data)
-+#endif
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
- 	
-+#ifdef LEGACY_FLAC
- 	return io_seek(data->stream, absolute_byte_offset, SEEK_SET) >= 0
- 		? FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
- 		: FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
-+#else
-+	return io_seek(data->stream, absolute_byte_offset, SEEK_SET) >= 0
-+		? FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+		: FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
-+#endif
- }
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderTellStatus tell_callback (
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- 		FLAC__uint64 *absolute_byte_offset, void *client_data)
-+#else
-+static FLAC__StreamDecoderTellStatus tell_callback (
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+		FLAC__uint64 *absolute_byte_offset, void *client_data)
-+#endif
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
- 
- 	*absolute_byte_offset = io_tell (data->stream);
-+#ifdef LEGACY_FLAC
- 	return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
-+#else
-+	return FLAC__STREAM_DECODER_TELL_STATUS_OK;
-+#endif
- }
- 
-+#ifdef LEGACY_FLAC
- static FLAC__SeekableStreamDecoderLengthStatus length_callback (
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
- 		FLAC__uint64 *stream_length, void *client_data)
-+#else
-+static FLAC__StreamDecoderLengthStatus length_callback (
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+		FLAC__uint64 *stream_length, void *client_data)
-+#endif
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
- 
- 	*stream_length = io_file_size (data->stream);
-+#ifdef LEGACY_FLAC
- 	return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
-+#else
-+	return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
-+#endif
- }
- 
- static FLAC__bool eof_callback (
-+#ifdef LEGACY_FLAC
- 		const FLAC__SeekableStreamDecoder *decoder ATTR_UNUSED,
-+#else
-+		const FLAC__StreamDecoder *decoder ATTR_UNUSED,
-+#endif
- 		void *client_data)
- {
- 	struct flac_data *data = (struct flac_data *)client_data;
-@@ -248,6 +322,7 @@
- 
- 	data->ok = 1;
- 
-+#ifdef LEGACY_FLAC
- 	if (!(data->decoder = FLAC__seekable_stream_decoder_new())) {
- 		decoder_error (&data->error, ERROR_FATAL, 0,
- 				"FLAC__seekable_stream_decoder_new() failed");
-@@ -279,7 +354,7 @@
- 			eof_callback);
- 
- 	if (FLAC__seekable_stream_decoder_init(data->decoder)
--			!= FLAC__FILE_DECODER_OK) {
-+			!= FLAC__SEEKABLE_STREAM_DECODER_OK) {
- 		decoder_error (&data->error, ERROR_FATAL, 0,
- 				"FLAC__seekable_stream_decoder_init() failed");
- 		data->ok = 0;
-@@ -294,6 +369,36 @@
- 		data->ok = 0;
- 		return data;
- 	}
-+#else
-+	if (!(data->decoder = FLAC__stream_decoder_new())) {
-+		decoder_error (&data->error, ERROR_FATAL, 0,
-+				"FLAC__stream_decoder_new() failed");
-+		data->ok = 0;
-+		return data;
-+	}
-+
-+	FLAC__stream_decoder_set_md5_checking (data->decoder, false);
-+	
-+	FLAC__stream_decoder_set_metadata_ignore_all (data->decoder);
-+	FLAC__stream_decoder_set_metadata_respond (data->decoder,
-+			FLAC__METADATA_TYPE_STREAMINFO);
-+
-+	if (FLAC__stream_decoder_init_stream(data->decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, data)
-+			!= FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+		decoder_error (&data->error, ERROR_FATAL, 0,
-+				"FLAC__stream_decoder_init() failed");
-+		data->ok = 0;
-+		return data;
-+	}
-+
-+	if (!FLAC__stream_decoder_process_until_end_of_metadata(data->decoder)) {
-+		decoder_error (&data->error, ERROR_FATAL, 0,
-+				"FLAC__stream_decoder_process_until_end_of_metadata()"
-+				" failed.");
-+		data->ok = 0;
-+		return data;
-+	}
-+#endif
- 
- 	return data;
- }
-@@ -309,8 +414,13 @@
- 
- 	if (data->ok) {
- 		if (data->decoder) {
-+#ifdef LEGACY_FLAC
- 			FLAC__seekable_stream_decoder_finish (data->decoder);
- 			FLAC__seekable_stream_decoder_delete (data->decoder);
-+#else
-+			FLAC__stream_decoder_finish (data->decoder);
-+			FLAC__stream_decoder_delete (data->decoder);
-+#endif
- 		}
- 		io_close (data->stream);
- 	}
-@@ -430,11 +540,19 @@
- 	target_sample = (FLAC__uint64)((sec/(double)data->length) *
- 			(double)data->total_samples);
- 	
-+#ifdef LEGACY_FLAC
- 	if (FLAC__seekable_stream_decoder_seek_absolute(data->decoder,
- 				target_sample))
-+#else
-+	if (FLAC__stream_decoder_seek_absolute(data->decoder, target_sample))
-+#endif
- 		return sec;
- 	else {
-+#ifdef LEGACY_FLAC
- 		logit ("FLAC__seekable_stream_decoder_seek_absolute() failed.");
-+#else
-+		logit ("FLAC__stream_decoder_seek_absolute() failed.");
-+#endif
- 		return -1;
- 	}
- }
-@@ -469,22 +587,34 @@
- 	if (!data->sample_buffer_fill) {
- 		debug ("decoding...");
- 		
--		if (FLAC__seekable_stream_decoder_get_state(data->decoder)
--				== FLAC__FILE_DECODER_END_OF_FILE) {
-+#ifdef LEGACY_FLAC
-+		if (FLAC__seekable_stream_decoder_get_state(data->decoder) == FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM)
-+#else
-+		if (FLAC__stream_decoder_get_state(data->decoder) == FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
-+		{
- 			logit ("EOF");
- 			return 0;
- 		}
- 
--		if (!FLAC__seekable_stream_decoder_process_single(
--					data->decoder)) {
-+#ifdef LEGACY_FLAC
-+		if (!FLAC__seekable_stream_decoder_process_single(data->decoder))
-+#else
-+		if (!FLAC__stream_decoder_process_single(data->decoder))
-+#endif
-+		{
- 			decoder_error (&data->error, ERROR_FATAL, 0,
- 					"Read error processing frame.");
- 			return 0;
- 		}
- 
- 		/* Count the bitrate */
-+#ifdef LEGACY_FLAC
- 		if(!FLAC__seekable_stream_decoder_get_decode_position(
- 					data->decoder, &decode_position))
-+#else
-+		if(!FLAC__stream_decoder_get_decode_position(data->decoder, &decode_position))
-+#endif
- 			decode_position = 0;
- 		if (decode_position > data->last_decode_position) {
- 			int bytes_per_sec = bytes_per_sample * data->sample_rate
diff --git a/media-sound/moc/moc-2.4.1.ebuild b/media-sound/moc/moc-2.4.1.ebuild
deleted file mode 100644
index 68309b0ed67e..000000000000
--- a/media-sound/moc/moc-2.4.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.4.1.ebuild,v 1.9 2007/04/22 16:31:21 dertobi123 Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="http://moc.daper.net/"
-SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/stable/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="flac ffmpeg mad oss vorbis debug alsa speex libsamplerate curl sndfile musepack"
-
-# libvorbis is pulled in so the USE flag is vorbis
-# since upstream apparently assumes ogg is an audio
-# codec
-DEPEND="media-libs/libao
-	sys-libs/ncurses
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	flac? ( media-libs/flac )
-	ffmpeg? ( media-video/ffmpeg )
-	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
-	musepack? ( media-libs/libmpcdec >=media-libs/taglib-1.3 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	speex? ( >=media-libs/speex-1.0.0 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
-	curl? ( >=net-misc/curl-7.12.2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
-}
-
-src_compile() {
-	econf --without-rcc \
-		$(use_with flac) \
-		$(use_with mad mp3) \
-		$(use_with vorbis ogg) \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with musepack) \
-		$(use_with sndfile) \
-		$(use_with libsamplerate samplerate) \
-		$(use_enable debug) \
-		|| die "./configure failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	elog "The binary was renamed due to conflicts with moc"
-	elog "from the QT project. Its new name is mocp."
-}
diff --git a/media-sound/moc/moc-2.4.2.ebuild b/media-sound/moc/moc-2.4.2.ebuild
deleted file mode 100644
index fdbe288e32e5..000000000000
--- a/media-sound/moc/moc-2.4.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.4.2.ebuild,v 1.1 2007/06/13 18:50:01 aballier Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="http://moc.daper.net/"
-SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/stable/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac ffmpeg mad oss vorbis debug alsa speex libsamplerate curl sndfile musepack"
-
-# libvorbis is pulled in so the USE flag is vorbis
-# since upstream apparently assumes ogg is an audio
-# codec
-DEPEND="media-libs/libao
-	sys-libs/ncurses
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	sndfile? ( >=media-libs/libsndfile-1.0.0 )
-	flac? ( media-libs/flac )
-	ffmpeg? ( media-video/ffmpeg )
-	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
-	musepack? ( media-libs/libmpcdec >=media-libs/taglib-1.3 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	speex? ( >=media-libs/speex-1.0.0 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
-	curl? ( >=net-misc/curl-7.12.2 )"
-
-src_compile() {
-	econf --without-rcc \
-		$(use_with flac) \
-		$(use_with mad mp3) \
-		$(use_with vorbis ogg) \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with musepack) \
-		$(use_with sndfile) \
-		$(use_with libsamplerate samplerate) \
-		$(use_enable debug) \
-		|| die "./configure failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	elog "The binary was renamed due to conflicts with moc"
-	elog "from the QT project. Its new name is mocp."
-}
diff --git a/media-sound/moc/moc-2.5.0_alpha2.ebuild b/media-sound/moc/moc-2.5.0_alpha2.ebuild
index df3d6abd8ed9..8dd1f55a9b93 100644
--- a/media-sound/moc/moc-2.5.0_alpha2.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha2.ebuild,v 1.9 2007/12/05 15:47:26 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha2.ebuild,v 1.10 2008/03/01 10:21:00 drac Exp $
 
 inherit eutils
 
@@ -34,7 +34,7 @@ RDEPEND="media-libs/libao
 	curl? ( >=net-misc/curl-7.12.2 )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/moc/moc-2.5.0_alpha3.ebuild b/media-sound/moc/moc-2.5.0_alpha3.ebuild
new file mode 100644
index 000000000000..ab60ef9f2200
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_alpha3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3.ebuild,v 1.1 2008/03/01 10:21:00 drac Exp $
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="ftp://ftp.daper.net/pub/soft/${PN}/unstable/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa jack mad musepack vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
+
+# USE aac for faad2 is missing because it doesn't work with faad2-2.6.1
+RDEPEND="media-libs/libao
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	musepack? ( media-libs/libmpcdec >=media-libs/taglib-1.3 )
+	vorbis? ( >=media-libs/libvorbis-1 )
+	flac? ( media-libs/flac )
+	wavpack? ( >=media-sound/wavpack-4.31 )
+	sndfile? ( >=media-libs/libsndfile-1 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	sid? ( >=media-libs/libsidplay-2 )
+	ffmpeg? ( media-video/ffmpeg )
+	speex? ( >=media-libs/speex-1 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1 )
+	curl? ( >=net-misc/curl-7.12.2 )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf --without-rcc \
+		--without-aac \
+		$(use_with jack) \
+		$(use_with mad mp3) \
+		$(use_with musepack) \
+		$(use_with vorbis) \
+		$(use_with flac) \
+		$(use_with wavpack) \
+		$(use_with sndfile) \
+		$(use_with modplug) \
+		$(use_with timidity) \
+		$(use_with sid sidplay2) \
+		$(use_with ffmpeg) \
+		$(use_with speex) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with curl) \
+		$(use_enable debug)
+	emake || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
+	rm -rf "${D}"/usr/share/doc/${PN}
+}