Revbump to add cache and tremor use flags and drop the unused, automagic popt dep (bug #439638 by Tomasz Golinski).

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 115 insertions, 1 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 607ef4806c6a..3ec27932fc45 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/moc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.101 2012/10/14 20:49:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.102 2012/10/26 07:59:29 radhermit Exp $
+
+*moc-2.5.0_beta1-r1 (26 Oct 2012)
+
+  26 Oct 2012; Tim Harder <radhermit@gentoo.org> +moc-2.5.0_beta1-r1.ebuild,
+  +files/moc-2.5.0_beta1-no-automagic-popt.patch, metadata.xml:
+  Revbump to add cache and tremor use flags and drop the unused, automagic popt
+  dep (bug #439638 by Tomasz Golinski).
 
 *moc-2.5.0_beta1 (14 Oct 2012)
 
diff --git a/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch b/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch
new file mode 100644
index 000000000000..83c071e6b1e5
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch
@@ -0,0 +1,12 @@
+--- moc-2.5.0-beta1/configure.in
++++ moc-2.5.0-beta1/configure.in
+@@ -341,9 +341,6 @@
+ 		AC_MSG_ERROR([You need curses/ncurses library and header files.])
+ fi
+ 
+-dnl popt
+-AC_SEARCH_LIBS([poptGetContext], [popt], , [POPT_MISSING="yes"])
+-
+ dnl getopt
+ AC_CHECK_FUNC(getopt_long,
+ 	      [AC_CHECK_HEADERS([getopt.h],,[AC_MSG_ERROR([You need getopt.h.])])],
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index cb0cd126bf17..0b9c59cf09b3 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -3,7 +3,10 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
+		<flag name="cache">Enable tags caching support</flag>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="tremor">Build vorbis support using an integer implementation
+			of the vorbis library (<pkg>media-libs/tremor</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/moc/moc-2.5.0_beta1-r1.ebuild b/media-sound/moc/moc-2.5.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..757251b6bae2
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_beta1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 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_beta1-r1.ebuild,v 1.1 2012/10/26 07:59:29 radhermit Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+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/moc/unstable/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
+oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
+
+# libltdl from libtool is used at runtime
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	sys-libs/ncurses[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cache? ( >=sys-libs/db-4 )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	magic? ( sys-apps/file )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-sound/musepack-tools media-libs/taglib )
+	sid? ( >=media-libs/libsidplay-2 )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	vorbis? (
+		media-libs/libogg
+		tremor? ( media-libs/tremor )
+		!tremor? ( media-libs/libvorbis )
+	)
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# moc-2.5.0 will require popt, but currently it's an unused, automagic dep
+	epatch "${FILESDIR}"/${P}-no-automagic-popt.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug)
+		$(use_enable cache)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with magic)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		--without-rcc
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with wavpack)
+		$(use_with curl)
+		)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS TODO # The rest is installed by doc_DATA from "${S}"/Makefile.am
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}