Stable on amd64 and x86. Depend on new ffmpeg as it uses new api.

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

6 files changed, 41 insertions, 133 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index 5c55be052643..e3e8b0b893d1 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.55 2012/05/05 08:16:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.56 2012/05/16 08:30:50 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -cmus-2.4.2.ebuild,
+  -files/cmus-2.4.2-ffmpeg.patch, cmus-2.4.3.ebuild:
+  Stable on amd64 and x86. Depend on new ffmpeg as it uses new api.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> cmus-2.4.2.ebuild,
   cmus-2.4.3.ebuild:
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 86f51a349648..6824901255b1 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,19 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX cmus-2.4.2-ffmpeg.patch 310 RMD160 c81915cca8febee3e9a8d144928413b268eb06c9 SHA1 236bba7c9cc36d960d4af96cb7ff47009f510aa3 SHA256 948de57576f9f42042558dbec47b560dad41e285e5777bc7c1cad99364595abd
-DIST cmus-v2.4.2.tar.bz2 204285 RMD160 3fbe7f9c5fb2f8cd21672769c7b551b099fd007f SHA1 12573e96e03435eca9b8a4aaeeb13a2da66f40a4 SHA256 1f54d94574f0f7f9beca34908b16141f8eb89070728305d8906b8dc19cca0c31
 DIST cmus-v2.4.3.tar.bz2 204508 RMD160 e41adbda28db529b245447f7bdf22cf8de118a62 SHA1 ba63a417b0df42fa9a4850dd8b922a95a426f7f5 SHA256 c8b853d6cc4de6cc628fe1cf48f5a841ab230d818bdbf39131b69d88844bcffe
-EBUILD cmus-2.4.2.ebuild 2375 RMD160 06b2cb1d7fea95591185f1bdc54fbfe845ef0907 SHA1 e993d0b180f36137f142de2a7f9cb3ff8ecaac49 SHA256 ec177bbc13d3a56bfd990bc4f0ec24ca66e9d1b023ff796eda709f89e5e11aa9
-EBUILD cmus-2.4.3.ebuild 2318 RMD160 4e798298c6f1422d946f7777281b7ef3a9184aff SHA1 491de11eb4bb002a6d0ffffcd4761f594fd13cc9 SHA256 6acc8c6b0f73b7634d08ed3c8d1c2f843b961a6ca76a07e0572a10e455e04ff4
-MISC ChangeLog 8423 RMD160 3ed636ed2842aa346e2d6ce6f0f3f865fd180117 SHA1 ace36c527edc64a4a10c14395d88978d072df3a9 SHA256 8ae7a3f6e1f44d1997a61c298367cddedf8ec22200c7518f7a559a12c706b9d9
+EBUILD cmus-2.4.3.ebuild 2331 RMD160 56683112d853b03fc17d9706e567e1defc3c878a SHA1 41584c02aca58b442d00600634523b10e1e827eb SHA256 b8c02b9a32bb3b2e9a253f81bd58d2cb0c721ecc786e529ad28029a112cbf83b
+MISC ChangeLog 8623 RMD160 3e3612052b5b9982286c21219f72d07fb3595732 SHA1 725f27d05b020de147d332f5be41343199683e41 SHA256 efb77ebf17b705c3d09b1da59d4532724a31df73826389961c57a6cc53beb1f7
 MISC metadata.xml 429 RMD160 b012d0b87dd5b8301c599ad13a0f9b41032f970d SHA1 4239c00ab77d094867e9430c7e31e335d24669ed SHA256 4433bda20d42a74320957493f0f7cf2ddfc70e6f06875f136fe1d70c64c2e28b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k4gYACgkQfXuS5UK5QB3xEQP7BE8Oq697YhohbxKxDL1/PL2k
-421ezT/wKsaYsMDzKgn3QzhGGvwFHKIg6zAtiZ1pV6EBpwa6LBzV6s1ZUHsUVcNx
-SjNgOtApAAW00FUu5rzMdtaV4MLyiP52AicpHXe4M1J1Ia3WQDniFtmebz6H0zoQ
-/bmLoTi0+6BGk+OIHVE=
-=JVgY
+iQIcBAEBAgAGBQJPs2XdAAoJEOSiRoyO7jvo6R8P/1n4fI84Fvob6zqCyJqZrRfN
+UDhHAzkRFBM1GDuR5tpBYiWJUmok4xN54ipSGNDq83pQBU5mhY34s73aawgzUtjL
+pw6N7OSw5d9BkCR1/h7KxWV7jRfrbgx/uYPE+qPjOmF1xrxy8bQb7Ih0sMINApvg
+1KL5CTf2Z1hWZRcFEf+/8+xSEifxGan70orTqfdEriZlDUXGxyzb7QX2i6AGOA9C
+vrYdzNOGjMwJReae9BdONlLdixSOmcEaG7L44k9EugNgopPz7kDviwyixhzSxLUt
+z3hiW1jLkTkSomD3DLJb12AGDAEPGjvyyBfJUZ7jNgEWYQqU+AUvG5EJbhIPPbLv
+JcIRs05FvvmCOUkJGohhjy4IXlQYxynQ30webv825VG+l6gA07Eg+SJ+jblONNr0
+fo+e7aA4XLICnJRJ+dBPNgRoSZKQFQLU3WA7udEJqI54oZITx/x+rWjhBXIDlL87
+B7fHpb7Zm15pojz7ZHPZ+SqN0OoTg+Hjf+f90+Nugzw8ZcQlvxN0U1pRNSnQ1Pw0
+ANU3dhr+htqBOzirG3oS9Q0acroP6PwJVGzmCrdyNkTWspJhE3HJCeLnWBNH7oB0
+LW3Rv9IjRSJL9uoDBFkWD221KXpjHCeW+gCj6Lr6LCTZIUwCmKfbWq39fSmcXqIB
+zvQQuMOoINmTyhK53P0E
+=ZEC3
 -----END PGP SIGNATURE-----
diff --git a/media-sound/cmus/cmus-2.4.2.ebuild b/media-sound/cmus/cmus-2.4.2.ebuild
deleted file mode 100644
index a52f56167d6a..000000000000
--- a/media-sound/cmus/cmus-2.4.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.2.ebuild,v 1.5 2012/05/05 08:16:16 mgorny Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MY_P=${PN}-v${PV}
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://cmus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss
-pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
-
-CDEPEND="sys-libs/ncurses[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	ao? (  media-libs/libao )
-	flac? ( media-libs/flac )
-	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	wavpack? ( media-sound/wavpack )
-	wma? ( virtual/ffmpeg )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	zsh-completion? ( app-shells/zsh )
-	pidgin? ( net-im/pidgin
-		dev-python/dbus-python )"
-
-S=${WORKDIR}/${MY_P}
-
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-}
-
-src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n"
-
-	use debug && debuglevel=2
-
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config mikmod CONFIG_MIKMOD
-	my_config musepack CONFIG_MPC
-	my_config vorbis CONFIG_VORBIS
-	my_config wavpack CONFIG_WAVPACK
-	my_config mp4 CONFIG_MP4
-	my_config aac CONFIG_AAC
-	my_config wma CONFIG_FFMPEG
-	my_config pulseaudio CONFIG_PULSE
-	my_config alsa CONFIG_ALSA
-	my_config ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	./configure prefix=/usr ${myconf} exampledir=/usr/share/doc/${PF}/examples \
-		libdir=/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_install() {
-	default
-
-	use examples || rm -rf "${D}"/usr/share/doc/${PF}/examples
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins contrib/_cmus
-	fi
-
-	if use pidgin; then
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/cmus/cmus-2.4.3.ebuild b/media-sound/cmus/cmus-2.4.3.ebuild
index be333eeb34ca..8165a2499ad3 100644
--- a/media-sound/cmus/cmus-2.4.3.ebuild
+++ b/media-sound/cmus/cmus-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.3 2012/05/05 08:16:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.4.3.ebuild,v 1.4 2012/05/16 08:30:50 scarabeus Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="aac alsa ao debug examples flac mad mikmod modplug mp4 musepack oss
 pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
 
@@ -30,7 +30,7 @@ CDEPEND="sys-libs/ncurses[unicode?]
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( >=media-libs/libvorbis-1.0 )
 	wavpack? ( media-sound/wavpack )
-	wma? ( virtual/ffmpeg )"
+	wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch b/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
deleted file mode 100644
index eb6c97e6c1ec..000000000000
--- a/media-sound/cmus/files/cmus-2.4.2-ffmpeg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmus-v2.4.2/ffmpeg.c.orig
-+++ cmus-v2.4.2/ffmpeg.c
-@@ -32,6 +32,9 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#ifndef AVUTIL_MATHEMATICS_H
-+#include <libavutil/mathematics.h>
-+#endif
- #endif
- 
- #if (LIBAVFORMAT_VERSION_INT < ((52<<16)+(31<<8)+0))
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
index eb79dedddc0f..9e81defd0737 100644
--- a/media-sound/kradio/Manifest
+++ b/media-sound/kradio/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX kradio-4.0.2-libav.patch 1954 RMD160 d7ba1d89eeb8c5077880ec5ae209f7ae34dabc7f SHA1 d5dc5d3b4086bbd2ec90e6e2f57a9c1434a416a8 SHA256 844a491a7f5dd87defe209e05c149ade90ce8e862ee21340d8bc72d9ce9c8b44
-DIST kradio4-4.0.2.tar.bz2 1604179 RMD160 2273737c772f47ed4c6124f9b9e994883b5124ae SHA1 d5ceac0e9260fc2fd1f4a0a567811b06edb0d175 SHA256 8d18fd2bac52133c712c0aef1dfd67ce503e0135860c248bdbe99c4b7ed97870
-DIST kradio4-4.0.3.tar.bz2 1628522 RMD160 bcef454f45960359d504159cd7708d8562ee18f4 SHA1 bfd94f7075af442ef1d196c8ea1af07dba9edcaf SHA256 b97667b0ae0a67a32106ccc24cd158caaff9421350adbb62485a0f51c4239d4f
 DIST kradio4-4.0.4.tar.bz2 1629750 RMD160 02b8e37f8e9cd63d187c23e7ccfbe023da1bc942 SHA1 61182470cb41f91570286e782dac4782487144db SHA256 04a552cf376b68f7483296069cf90703f0c49899642986062e7e28f7336ea416
-EBUILD kradio-4.0.2.ebuild 1184 RMD160 92c65704aaa89381809569ba7e4e27ff0add4b3e SHA1 25583287347794444b9dca3801ad5a31841862b5 SHA256 af9b4e546a1b61ed9abe20c3d2d28da0bd8fa70fa5fcb192548c8152cef4183f
-EBUILD kradio-4.0.3.ebuild 1141 RMD160 1f196e01e8f87c95d08c3deb0b369c4463c54456 SHA1 bc7b3b5c30a00fcbdf913adcd7f9217e809498b1 SHA256 801ff8cc4d8ca3a78882440871745a89283378ef4316ea3b37db588a86b840e8
 EBUILD kradio-4.0.4.ebuild 1140 RMD160 a831b2e16cebc46ca19ce2a6bc5df6acc3000d06 SHA1 cc00fed93d5338f5cc6fe6f07e6fc1308572e57d SHA256 31bdb974676edbdd88541d9a2f0366f41ce0611bebe1c206aef91965ae7bb7ea
-MISC ChangeLog 5189 RMD160 7c49b93b4ef4fb85bb6c9afd7f24f7ceeaa6bfa9 SHA1 f7bd3500db3f4b860c2a159156ee8abcea7a0ff9 SHA256 c66d4b603a3741aebfd51c0006d3a8c46d559055fa64a48b23f264df5239c9e3
+MISC ChangeLog 5339 RMD160 7867f6502209ed45e9209fcdf854196e17a58ec7 SHA1 894ce3721ea533bba0f8918220aeea21ad37a5f7 SHA256 ea7a03333725a4dcebb8152b595fede8339dd4914d2a6fc0ff1f6c7bcf856082
 MISC metadata.xml 220 RMD160 a7adf69690c8573ceceff9b8efa22e074c1c2499 SHA1 41f9fb9f2920aa457ff68d560d1a1a3d90a09915 SHA256 b3e0af69cc34497798ede4df65665f7e1ef13913da5ade30ed744343152648da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPRQ54AAoJEO+t9ga+3I3ad+8H/iSxpyPX42YHDXNiySuHl0g2
-E96ngMMNwZB0eGkCxUY6cRq/NbBJnGdiMMxH35rb71oeoIFgAbeAXgnRG7gjuxrc
-Jn9GdnlK//xYbb6Kg6ghbzPdZ/Yv2bgTbrpBvHidLAuExKjQ8ACHB392WY0C65Hu
-A0WfckMmLHCy4i7VgomeUhrwL44b/afritK7vKVOnUYYRT2r0f0/hWpkiCswhvAg
-N3RsC3o3oz+0abgwWJ7OiTdOxs1svUmLTBsGA7v9qXxRRkgzYjDULXJJVluFQJ2k
-d5dxXf9ZoW60KrR9t70PjbttiFrUF0KeZ/QHk7dFrSPct+ZX8K4TZzoQMGGuZ+4=
-=K2+k
+iQIcBAEBAgAGBQJPs2ZRAAoJEOSiRoyO7jvoFRcP/26juKCEK/ZUYmB+QTs9RngA
+bbe8/Z7sZuZQWSTffXcCn9gmUj4FNXYWiquRIXL1X5VOCzF+keMF2ZH6MjPHqxq5
+4rxYL2FgJzBzXZWx5d+2JOAYEkbgMv/VyuIx10s3E9OVTp0IHvfVsnJ8qx3eYImw
+pgB9qAJGfzPorujxKLu+J13PjSKAUgHeFRJWmRwA7IMFcfPwdQBIfPoWJLxNzxsa
+4/6PzDD5PYWifQZBBUkhLzFm33AWCmZxNlJXwBk+MeF/pOM1K7n/DNGhLOwyCjnB
+tDQ4WJ3TPjjkfUBE7lsEmVxpi1i6sRIfL/JXzbTpZ2Hz6nvLWm78Me+0eJe5u5eC
+l56vx3WNM3hdmWL0ajWxFwzGkwjQ1aVnzwbWl3I/9aoxRlPppHSJV8t1zKm3/Zu+
+znU24hbhqZdVNzy7oXHsAHkmP2wV5bc+HxerqBhtJGbdgmq0OJsKoK4AzRqnVqhh
+Id7twCrahM8izYOmfnQ+w8AhhbcdgvkQXb+Wf15CIkZmY43BrkDsxr+HdlbDxNvi
+di0kZ10WJotsbIWwNAJqB55rEFK+/OnuleLABRdiaaviNqaTEK3zGB+0hqTjF2Qe
+rI0M8s3dN3nI7JRcgDTkRJeXwf7vQ13b2kqZ7PSErQIop5bAXt9FxV39GyU4LHDR
+ma9vy/D+57+P8ReuTiHv
+=QHAD
 -----END PGP SIGNATURE-----