version bump

(Portage version: 2.1_pre4-r1)

5 files changed, 106 insertions, 14 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index eb7f665f21be..8f1b82b32e65 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.21 2006/02/15 11:09:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.22 2006/02/24 05:31:05 chutzpah Exp $
+
+*moc-2.4.0 (24 Feb 2006)
+
+  24 Feb 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/2.4.0-endianess.patch, +moc-2.4.0.ebuild:
+  Version bump (bug #123620). Added ffmpeg USE flag. This also should fix bug
+  #121687.
 
   15 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> moc-2.3.2.ebuild,
   moc-2.3.3.ebuild:
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 47ec3ea88a57..ea2addffee66 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,9 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 84ee32f8b880eb0a24e54cdafec7478d ChangeLog 3090
-RMD160 e9461fa869a8ff20d7e3f11e206ab94303aaa6cf ChangeLog 3090
-SHA256 e9977a5c691c7c7ceff5a3ccf79f019559708478214259de3e85b63c850b7acd ChangeLog 3090
+MD5 7c989bb176b073d5a76e4c150831a3ab ChangeLog 3309
+RMD160 4ffd643137b19a69bfd423ee55064ecbd09285d5 ChangeLog 3309
+SHA256 e1e565bacb9e0b416984ea3f4a5ef5bd1f73e8c490894184d972e9d4f1fc6240 ChangeLog 3309
+MD5 36131173f75015c218676e54f227a89e files/2.4.0-endianess.patch 576
+RMD160 229b48d7fae299de5b1526fdd1e740f2292e377a files/2.4.0-endianess.patch 576
+SHA256 49bbc07606d2c09778d18df136db7be955ea3929cce4c9b67e05de6814fbaacc files/2.4.0-endianess.patch 576
 MD5 986d4f67476a2c02f6ca1b20e7c57c0b files/digest-moc-2.1.4-r1 61
 RMD160 5af92fd893397f49bebe56f2998c778959cc20f3 files/digest-moc-2.1.4-r1 61
 SHA256 b292a3f7f4d1b216193fd7923b1ec4f7beaf6f79530d30987ed1e506ae78f9b0 files/digest-moc-2.1.4-r1 61
@@ -19,6 +19,9 @@ SHA256 932834477534ff0434927a40e95dd211aae45f3f0e532600e398f3ab9f3bcb2c files/di
 MD5 05b617b5a147ce1510f6cdcdb083df32 files/digest-moc-2.3.3 62
 RMD160 6c7f5a3738be5c17183d35be169f185b7c5bf1b4 files/digest-moc-2.3.3 62
 SHA256 71742f65608e4af00dc96b58086c92a777a6fb929582cc0ddf0b23351dd1d2b0 files/digest-moc-2.3.3 62
+MD5 fa5c2370ac292a40aa26b068a67e7a76 files/digest-moc-2.4.0 232
+RMD160 f850a5249c1e9e3e039eb6c500e29f0234d9a500 files/digest-moc-2.4.0 232
+SHA256 4bbfda2b9d0562e9e0669e45952ec2160d80ee1f61336ef7705df16e447f15ac files/digest-moc-2.4.0 232
 MD5 7d3794df50327b997ab26ab0a1b6de61 files/moc-2.3.2-configure.patch 3063
 RMD160 8c9c31f98ca7ce0f5104e571e51cd47f718a1740 files/moc-2.3.2-configure.patch 3063
 SHA256 1af4d055c5aa7fa1fa2030ea9f7b1ffb401fd1bea8c1f6464fbb04f9a5ca0882 files/moc-2.3.2-configure.patch 3063
@@ -40,10 +43,6 @@ SHA256 e03255b1e0ecd63a6f12aa89b7d7d2a16d2926dcca5ae97756be9f04f77717fd moc-2.3.
 MD5 9647c7eb15b4a70e86dca64ad65a9967 moc-2.3.3.ebuild 1646
 RMD160 f70b0a913a12fe0f1a20b0203de08bca947c4978 moc-2.3.3.ebuild 1646
 SHA256 a39e2076580858d751590a2fe95aa7b28ef62d88fb0293c4487f38cbc2b40def moc-2.3.3.ebuild 1646
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD8wvYAiZjviIA2XgRAtwqAKDzcfm6UYI0D2ud3URaCAagfBaA+gCeKUfa
-XbYM+BJ42afDlyroLhDSi5E=
-=adVd
------END PGP SIGNATURE-----
+MD5 72231f7f0b9551abda2d2ca032039289 moc-2.4.0.ebuild 1801
+RMD160 77b31cdfa9e74a25276deea33dc5d4c7c4e414bc moc-2.4.0.ebuild 1801
+SHA256 0f1437c8b1f68be7228997a7c0ce9c126e204f603b0fe1754b93d246bdbb1045 moc-2.4.0.ebuild 1801
diff --git a/media-sound/moc/files/2.4.0-endianess.patch b/media-sound/moc/files/2.4.0-endianess.patch
new file mode 100644
index 000000000000..60cc3aa818c1
--- /dev/null
+++ b/media-sound/moc/files/2.4.0-endianess.patch
@@ -0,0 +1,20 @@
+Index: audio.c
+===================================================================
+--- audio.c	(revision 1882)
++++ audio.c	(working copy)
+@@ -229,8 +229,13 @@
+ 
+ 	assert (best != 0);
+ 
+-	if (!(best & (SFMT_S8 | SFMT_U8)))
+-		best |= req_with_endian & SFMT_MASK_ENDIANES;
++	if (!(best & (SFMT_S8 | SFMT_U8))) {
++		if ((formats_with_endian & SFMT_LE)
++				&& (formats_with_endian & SFMT_BE))
++			best |= SFMT_NE;
++		else
++			best |= formats_with_endian & SFMT_MASK_ENDIANES;
++	}
+ 
+ 	debug ("Choosed %s as the best matching %s",
+ 			sfmt_str(best, fmt_name1, sizeof(fmt_name1)),
diff --git a/media-sound/moc/files/digest-moc-2.4.0 b/media-sound/moc/files/digest-moc-2.4.0
new file mode 100644
index 000000000000..8d3fc437d389
--- /dev/null
+++ b/media-sound/moc/files/digest-moc-2.4.0
@@ -0,0 +1,3 @@
+MD5 5b31665390fb0b30d19dadec4e90abb8 moc-2.4.0.tar.bz2 419792
+RMD160 084411d527bbeabd7caaae5acf8a3391a2d07f8f moc-2.4.0.tar.bz2 419792
+SHA256 9fffb28f0edb020dffe605b0d69d94f1b3abe3d1e8beffa2ea7809daecaff136 moc-2.4.0.tar.bz2 419792
diff --git a/media-sound/moc/moc-2.4.0.ebuild b/media-sound/moc/moc-2.4.0.ebuild
new file mode 100644
index 000000000000..4959e6a32bf8
--- /dev/null
+++ b/media-sound/moc/moc-2.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.4.0.ebuild,v 1.1 2006/02/24 05:31:05 chutzpah 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="~x86 ~amd64"
+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}/${PV}-endianess.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 () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	einfo "The binary was renamed due to conflicts with moc"
+	einfo "from the QT project. Its new name is mocp."
+}