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

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 126 insertions, 10 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/Manifest b/media-sound/moc/Manifest
index b72e3d603d48..aa4926f5c36c 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX moc-2.5.0_beta1-no-automagic-popt.patch 357 SHA256 3db0e3d78f19f5c66ae815f790cae22945aa732505e03055d3eb29defa15188a SHA512 067f77214cc1610c14fd441709014b7644bba9b604142e710bd7733cd846c1df0663eee33295fb2f877b8aca6352141fc49ae5f9259b7f12267eb580d130dbef WHIRLPOOL 8b5cf974326f279efc05ebda5d2375105f61ae97404430b5d8af718441c2f6b77540618262303553f01c79dac953f3b09d685cc30a7f12d4c2be3e7c3f485b3a
 AUX moc-libresid-builder.so_not_la.patch 937 SHA256 7ab7849ebcb1b5415bfa956c9302ba3fcc45e70e43c7adec8c84cf2ebe2f5bca SHA512 57788ffa9eaf433ebcb232590212846f72f879b148f772a96af544305e91a5128ec79c95531f1b40fd638f8e22506dc3b8783057fb4f37da67cad892b190cf88 WHIRLPOOL 5a1e52133adbb9532059d9d99057c40b7d782f957c1ab70aafbca1a4a7c5d2c25fdbd9ec20813f9ff1593369356bc3c10943c112d853fb3b1cc2a82ce79b05f3
 DIST moc-2.5.0-beta1.tar.bz2 570468 SHA256 076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6 SHA512 16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2 WHIRLPOOL 793fa9bdd23da14cc558262335b81560aa82a86c641b2a163af64d80659b652ada83193b0ed2888bfbe0d0b43cb35447ad0b0fa8de394742c0e162d3050520de
 DIST moc-2.5.0_alpha4_p20111211.tar.xz 231324 SHA256 1879590fc5054a4599b5932fa5b985ed6acfe88ca1a279dd6ed07607bb5be968 SHA512 05bdc506040cb7c77853d53c3199824451393c0e27adcbecfd23083f84c3a62b589e8d19d3f030fba1eb5e06bf8db83946b870ee39515b2ed4cff98218229b1b WHIRLPOOL 954aae7523cdb5d764438c6f79e54855528e1ede8ac46ed1f7019b0270bb3f357896f7eee8c6b897c31e1eb44757d004ba495a7e6553f400e919fe32db6b24ce
@@ -8,17 +9,18 @@ DIST moc-2.5.0_alpha4_p20120501.tar.xz 250840 SHA256 3babca9c8f8889b7b814721de2b
 EBUILD moc-2.5.0_alpha4_p20111211.ebuild 2204 SHA256 cbf5fe1d9be2c728f1d131aeab6bb46dbb03a7baba5b84e2d9466fa2b2b43820 SHA512 0bf784a08b551824748f53843445e28d6b07affbdbfaa692386326f9aa028e940d90baf027093a39fc02daf38eb7894651ad4804b34fa6f0e1720dc1783bed8d WHIRLPOOL 72bcae277b34fe1feb2e91d43cf397c0722b0541d2ffff8400abfc82ceb3c779fc83a8f052fc1e9315ab7f49b96c64fa4ed918e4ce657b948fd953f6dc73caf1
 EBUILD moc-2.5.0_alpha4_p20120501-r1.ebuild 2339 SHA256 5e2cd931443f53f0530d185e272b3e955baa1b563a6a26a4f34733e279d7da1e SHA512 22f4a2b70c463a65844ac0d557cf1989e623d8d1e2efba91585a38cae289acd77efe539b171566a7e9865be1d4a7f7e3e8c3ecd15d672b93e8f08120b0071afb WHIRLPOOL 8b7e9bc6cd7e49fd358dca206da4c1f5f2b1d10e1397659c9da6a7a872523e6dbddf884908ebb85bc0347925ed630dd46f9c8a6578cd5618174581f7272631af
 EBUILD moc-2.5.0_alpha4_p20120501.ebuild 2257 SHA256 5452fcca7ac08e0c4b4c0d4a40b603009e5fca06e94050165e4301fa8d894c6e SHA512 a0136425c360cd48f27f7c293cff4be0d630e8a1fd883f02ad07a577dac1bfc6e829c4e646e4ed4003977778e919582f1ba92a702ac5254ff008a4c3f8d43272 WHIRLPOOL 6fd602824877862f8ee43715ef0f5af8852f1947202d885618aeebbcd5639b3d7db9ae852231da0ed40ceb66c317cc02c1e453e4e15e5a3b419b08ca26adbc4b
+EBUILD moc-2.5.0_beta1-r1.ebuild 2583 SHA256 c42a2520832db5dda0086701e255833efcde8f70808539ec899707746595739e SHA512 5c8f8f5e22e8d54f6f8d59ead8cb47383da3d92e0c1ce8f4afe3a64d7aa0b84fe4d063fda2810c0ce70100e436af2b78e9913f2420ede9e664ea1bf44fcd9633 WHIRLPOOL db9748dd4da70f0e5dec4d13bfccceb68cd892ee1dcef9c57c5dccc52ba1145f2e1d4355fb45f112fa95ee70125e1197f43170c437ecb9ffc7293e1ae18fd6b1
 EBUILD moc-2.5.0_beta1.ebuild 2307 SHA256 dc1bd7d46d6b38b6e5cdd72b76fe20bf6f9a91799d2e511713f9a1eb18f46c8c SHA512 d02cdec3c1c21641296a45b1b6f052983638cfdddf25f4ed80459e24e819eab6ce30a08ed23bd571df48fc204fb08f832a040fe28acbd73434dba752d67359d8 WHIRLPOOL 3162ef3a366a7fe4a30e6c89ec1517154a4df8788df660641145a1c8df0c7bd055c98087a93ae7dd8069e6650da3685c3ae9589616134a6650f039063f2d440f
-MISC ChangeLog 14382 SHA256 94408240f227e1404fd6bbe3ec2dc032b0e11a4cc1a15fa3b86fdbee13a99b9a SHA512 13b71695fe8d01a392e248606a29322526ff091b17bb51d76af77b7db069a7023975be61f3021dc2c508a5557747e366ffcec99aec9c0e876dbaa41feb229fa8 WHIRLPOOL dc356bd81b118a9c31d635952a536dac73da7f84dc2fc95225917538392058d888cd12528a2a1174e9dcc0a811a14df716fdaa0b6cb06ae47a1904095de2936a
-MISC metadata.xml 308 SHA256 7066b4b147b2c6aab2965e03fc2eec77ae4e87cd4074e911f6c1a2696c6a7f68 SHA512 479a0c32ed2e04af05f7b228b1f7f5cf8eb4380d0f17f83d2989d066064cc60d049e7947b888d8e4bc264f8296c49abad9ca79f0b4c5d5a67b3e9667571f99a3 WHIRLPOOL 25860d298684023fd154f4cf808cd870eb184d404cecb135bf66a1593080e9d43f4e4c286b149b114a751fcd8265a73eff19dd1e570916b3c91e3fde4f418576
+MISC ChangeLog 14679 SHA256 491b2319042bf9ee2ea47daced5232d4827a8c3add6316e002e51d3f3525ccf0 SHA512 4ae2b282990d8b3b916d30499add55ab518b0be2abfac82c1c4f406219378f973210b3ad05b4e8bad7317a1fdfcd5b225716769003b353d13f607a6d2d2acdde WHIRLPOOL 62483d6782b4d9ac4c3a140b01f0f4d7c3a3743a7cec4a4e58643fd2de557ed22d089bbfe4d588c9f2bd5df71b9a89a3e69164c2e82c421c56d7922e71dd7328
+MISC metadata.xml 502 SHA256 397b0ee37b972cc4af0ed35925a6ecf872c40efe523b5691988efe124246b2a0 SHA512 180b269db5e181ee68bba79510f8798408a9d050d172f6ccabe9b9f6b477cf28d25d4846b1eadff5d05bdf997fc56e55140f896c51b138459a06c2a498e834d1 WHIRLPOOL f174c34a04a43f14dfd46e30b7edda211fcd4aea0fcaa20ac92618b4ef5f8f9f3de9cecea03d6ad7527a2743fe0bf27706e22f94f18607988653125e92239051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQeyVNAAoJEEqz6FtPBkyjsLsIAIZR40aTSzdeiimVOqTJehsP
-LUoZourcuwYUvEqUksCcsOp+HYQCJvYT3LsIqRKixJ3XHy6B7MHf75ImiPtCkGPo
-K69R4kii6wGDQo9CLxUVdwXhbj5O/YTB/eh2/xl3ZhFZabZrKKx9MPDUguK0fVcE
-JIdZFLI0NBRbXLW0tDsceNyomRqzr33lPiz8OBAgqxZHZkMhON25Lj6xt6d8qxP6
-YDEvJOVAKbQk0Gv7OwdQTFNxlhoKjFXxnd2be2c6I4vzjLAc7ObBGdVNU58C0l/J
-cM1n7USAwCvU4P0p5ASzThUcPmZPIMwJldkcxZw/Jhm/PtFgIkgCdCD6+Tq2m1E=
-=Zi81
+iQEcBAEBCAAGBQJQikLnAAoJEEqz6FtPBkyjw8gH/08eDy4CB1RkOV1BZQAKj1Nz
+TV8cZwZ2O+6bAqtXZx27w7XQ0s2+sRIQmmMtkXLtHUOQKyjixPNeUvtJQP7XrQSg
+VT9lfyWoWD+PYQ1zZS7XcbthD3xAZoQN5RfJjp8fD9G6rRTQyzhlBd4p7XtE11AG
+fs8uKzWX8ZqX32o1QzJ6t6mHhY/wRFv7d7o2ZqIBnt2Sfp8o1ouK57GOvujuOx6w
+13WPNycA2kFU7oYLOMkIujYcTtjE/xteCSQqZv1duvlEZxI6XjIEaoOr+wHyHGqF
+ZVcN3XRaB2fimjh19/tyZ4sru0z+/78ICITDxK1kb7u88w0uTqeTBHodjOyoCgk=
+=I8su
 -----END PGP SIGNATURE-----
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:=.*:='':" {} +
+}