3 files changed, 103 insertions, 1 deletions
diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 3078c7abb2b3..019e52e68515 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/moc
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.48 2008/03/05 19:04:57 drac Exp $
+
+*moc-2.5.0_alpha3-r1 (05 Mar 2008)
+
+  05 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  +files/moc-2.5.0_alpha3-faad2.patch, +moc-2.5.0_alpha3-r1.ebuild:
+  aac USE for media-libs/faad2 by Hendrik Iben, bug 211805.
 
 *moc-2.5.0_alpha3 (01 Mar 2008)
 
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch b/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch
new file mode 100644
index 000000000000..e114f0dc1376
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-faad2.patch
@@ -0,0 +1,25 @@
+--- configure.in.orig	2008-03-04 16:45:23.000000000 +0100
++++ configure.in	2008-03-04 16:34:10.000000000 +0100
+@@ -276,12 +276,17 @@
+ AC_ARG_WITH(aac, AS_HELP_STRING(--without-aac,Compile without AAC support (libfaad2)))
+ if test "x$with_aac" != "xno"
+ then
+-	AC_CHECK_LIB(faad, faacDecInit, [
+-		AC_CHECK_HEADER([faad.h], ,
+-			AC_MSG_ERROR([You need libfaad2 header file (libfaad2 devel package).]))
+-	])
++        faad2_OK="no" 
++	AC_CHECK_LIB(faad, faacDecInit, [faad2_OK="yes"], [
++          AC_CHECK_LIB(faad, NeAACDecInit, [faad2_OK="yes"], [])
++        ]) 
++
++        if test "x$faad2_OK" = "xyes"; then
++	  AC_CHECK_HEADER([faad.h], ,
++            AC_MSG_ERROR([You need libfaad2 header file (libfaad2 devel package).]))
++        fi
+ 
+-	if test "$ac_cv_lib_faad_faacDecInit" = "yes" -a "$HAVE_ID3TAG" = "yes"
++	if test "x$faad2_OK" = "xyes" -a "$HAVE_ID3TAG" = "yes"
+ 	then
+ 		FAAD2_LIBS="-lfaad"
+ 		AC_SUBST([FAAD2_CFLAGS])
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
new file mode 100644
index 000000000000..1925889c0a69
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
@@ -0,0 +1,71 @@
+# 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-r1.ebuild,v 1.1 2008/03/05 19:04:57 drac Exp $
+
+inherit autotools eutils
+
+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 aac jack mad musepack vorbis flac wavpack sndfile modplug timidity sid ffmpeg speex libsamplerate curl debug"
+
+RDEPEND="media-libs/libao
+	alsa? ( media-libs/alsa-lib )
+	aac? ( media-libs/faad2 )
+	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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-faad2.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf --without-rcc \
+		$(use_with 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}
+}