old

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 16 insertions, 111 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/Manifest b/media-sound/moc/Manifest
index af0fc07af706..d4d56fc983bc 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX moc-ffmpeg.patch 934 RMD160 d6deae46945b55ebd77d03985ba36fca8f29f5b9 SHA1 f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d SHA256 bb334b6555e76f2f8d3087abe59b97907300db72a683a723eac2f8feaa1e4bce
 DIST moc-2.5.0-alpha4.tar.bz2 520919 RMD160 d2dec23ad586b35a7350bacfb3eb9b3033abbfc4 SHA1 ca55b3bed0f3f3f352ca43078208ab63e20f40fc SHA256 a1ece00c17ce0ebbd387c0412b08f038dd07cf226726c26367cbc982ce3363b4
-DIST moc-2.5.0_alpha4_p20110428.tar.xz 222744 RMD160 43bc9f98a3db20637edcaef2af22dd91fbd504d7 SHA1 fcfb0521bb18aa3fdd3fe40e33885b57da53e62e SHA256 ebc103a62a02b0926053d70b3709ca48ab2b21fbe4014ed15fc6ae9c4113f54a
 DIST moc-2.5.0_alpha4_p20111211.tar.xz 231324 RMD160 03a31facdbcbf4d0e6cf5835e88680518d84d2c4 SHA1 d7a77282898a32e63a96de5787e6fd43dbc1aeec SHA256 1879590fc5054a4599b5932fa5b985ed6acfe88ca1a279dd6ed07607bb5be968
 EBUILD moc-2.5.0_alpha4.ebuild 2016 RMD160 8a8219ca2d42497444e0875819310b4d02487f78 SHA1 0ca1444c2566847c94e14a8b65a75835e678595f SHA256 9c822db29a17ed8dab912cd8c2a1c91534f16d392644bb8c52adb58c0789b8f4
-EBUILD moc-2.5.0_alpha4_p20110428.ebuild 2060 RMD160 9b7c3c344ef07fb9914bae5ed5ed60ab927289ae SHA1 252f357202ceee112496e28a9645dd6b82f494ca SHA256 ce17c07b68632d9998dc35e6ec962c121bb034681c283c02909fe91b5c93ed7c
-EBUILD moc-2.5.0_alpha4_p20111211.ebuild 2215 RMD160 a5024c0fa328bbbe4eed83a7d24bdbdbd9b77079 SHA1 de89c93a38f2599b7f920b88962437344276892b SHA256 c720f1507ed9987f725377e5a0c50c26b20f189f7a86a5318110eb5153b559dd
-MISC ChangeLog 12404 RMD160 2950db525690f89709d729da094a2ab0a302e381 SHA1 241f0bc44da2d3e4da5088b1ef43543c7e586340 SHA256 1aa3a0297a8e0bb6ba7bbc89f32d274e5a839be5ccca2bda4ef3732a2c4fea77
+EBUILD moc-2.5.0_alpha4_p20111211.ebuild 2214 RMD160 272586b0be948e9b6121c0e541ad6f74c7633fce SHA1 b325e4d5fbd8fc31014d39259b4acb71c1135d2e SHA256 44c1a8ddee11389b4d03fc4efb4de07d55efa1dd16b52c1a03ff7ca1a0545186
+MISC ChangeLog 12528 RMD160 00896a800db5c2465033b530cd90b3005b0e742f SHA1 1092c1a90eb52c7264b5231d39ab70812c45796a SHA256 96c4caecde137aee2b59e18b3a7962a12b3697c330960aea1643e84242dcc82d
 MISC metadata.xml 244 RMD160 0f687a8096aa4afe69e958cf8cc4eb62361694d2 SHA1 14fe5a7bc2710d0240e9208786b24f409e71b179 SHA256 3f55674c364d24e3977d896f3bc95745716c55817511c3fc7282523da0aca164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO5DCqAAoJEEdUh39IaPFNby0H/1y8yQV+0Qkfj9SI3YYaDvag
-WqmcetaJvhMs4x0fa9fg0JhjAnIBU5X1K3cAqh5qNS8OsDeDFmVmaccmZipoPmt8
-J//9wDo4y8c5ctd4ISiLeTaxEloH/z7q2FZjpBlFS5uaAhTlPFCyflNBICdbgqRb
-0+5Yo7z+Pd7bBRavtcOJWjBf6eSWpJYuXv6kRNNXuqNQDO4igWTelUM/XxhxOEFI
-TUwKVbW+WVf5wbjnO6iaKhueMKrWkYNEvWbuo+iSYxtuF4cyhneKj9NYC0fLuNbe
-3lpE12OrCvw0xLJGTP+zeHI8OhKklSdzayE/p4FPlUQHebXucDp5GuVrr/Z+vMs=
-=GijH
+iQEcBAEBAgAGBQJO5DEXAAoJEEdUh39IaPFN7YgIAIzEdK0ZfwtNMBrm9pHswD8c
+oPQm0jWMM44aeQ2l1TXQ85KftuvbBtsT1n374LA56+oPhuWzlSA+yND9ZSxTFNPr
+F+ztQzi5usSkZ3CV2PJgSw4W8cGwllr4GSmcEKaqbDlZwtjQniqXg6cH7RRfaWti
+yFTzXK3GIBMNr5yyiiBQ3polwtzD0DPeN6VOmIpk7V8ccc0tPLuDyHZlKAervdyE
+AC6eEhzCINbtnqFQ2tMj0hMU4uGFkpq5mux1pbLKs4sh336oOrG/hVb7zidK59Er
+BqrSmvsnhJxV6Pf9/G362Og+kK4EWcwqgA/rW5Av0TKoLSuDsv0xJM8F6qUATZM=
+=uYeh
 -----END PGP SIGNATURE-----
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:=.*:='':" {} +
 }