old

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

4 files changed, 7 insertions, 99 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 455d7d83d99f..ded55ca0e42d 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/moc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.87 2011/12/11 04:25:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.88 2011/12/11 04:26:59 ssuominen Exp $
+
+  11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -moc-2.5.0_alpha4_p20110428.ebuild, -files/moc-ffmpeg.patch:
+  old
 
 *moc-2.5.0_alpha4_p20111211 (11 Dec 2011)
 
diff --git a/media-sound/moc/files/moc-ffmpeg.patch b/media-sound/moc/files/moc-ffmpeg.patch
deleted file mode 100644
index 7554ea14e3d8..000000000000
--- a/media-sound/moc/files/moc-ffmpeg.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2307)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -28,12 +28,6 @@
- #include <ffmpeg/avformat.h>
- #endif
- 
--/* libavformat's API will be changing at version 53, but at present there
-- * appears to be no guidance on what will replace the deprecated fields. */
--#ifndef FF_API_OLD_METADATA
--#define FF_API_OLD_METADATA            (LIBAVFORMAT_VERSION_MAJOR < 53)
--#endif
--
- /* FFmpeg also likes common names, without that, our common.h and log.h
-  * would not be included. */
- #undef COMMON_H
-@@ -137,7 +131,7 @@
- 	av_read_play (data->ic);
- 	for (i = 0; i < data->ic->nb_streams; i++) {
- 		data->enc = data->ic->streams[i]->codec;
--		if (data->enc->codec_type == CODEC_TYPE_AUDIO) {
-+		if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 			audio_index = i;
- 			break;
- 		}
diff --git a/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild b/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild
deleted file mode 100644
index b2886c9694c8..000000000000
--- a/media-sound/moc/moc-2.5.0_alpha4_p20110428.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 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_alpha4_p20110428.ebuild,v 1.2 2011/05/01 17:05:43 scarabeus Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Music On Console - ncurses interface for playing audio files"
-HOMEPAGE="http://moc.daper.net"
-SRC_URI="http://dev.gentoo.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="oss alsa aac jack mad vorbis flac wavpack sndfile modplug musepack
-timidity sid ffmpeg speex libsamplerate curl debug"
-
-# libtool is used to load plugins so it is RUNTIME dependency
-RDEPEND=">=sys-libs/db-4
-	sys-devel/libtool
-	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 )
-	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 )
-	musepack? ( >=media-sound/musepack-tools-444-r1
-		>=media-libs/taglib-1.3.1 )
-	timidity? ( media-libs/libtimidity media-sound/timidity++ )
-	sid? ( >=media-libs/libsidplay-2 )
-	ffmpeg? ( virtual/ffmpeg )
-	speex? ( >=media-libs/speex-1 )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1 )
-	curl? ( >=net-misc/curl-7.12.2 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-ffmpeg.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rcc \
-		$(use_with alsa) \
-		$(use_with oss) \
-		$(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)
-}
diff --git a/media-sound/moc/moc-2.5.0_alpha4_p20111211.ebuild b/media-sound/moc/moc-2.5.0_alpha4_p20111211.ebuild
index 12eecb4e736f..8864efad9563 100644
--- a/media-sound/moc/moc-2.5.0_alpha4_p20111211.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha4_p20111211.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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_alpha4_p20111211.ebuild,v 1.1 2011/12/11 04:25:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha4_p20111211.ebuild,v 1.2 2011/12/11 04:26:59 ssuominen Exp $
 
 EAPI=4
 inherit autotools
@@ -71,6 +71,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS TODO # The rest is installed by doc_DATA from "${S}"/Makefile.am 
+	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:=.*:='':" {} +
 }