Version bump to newest 3.x branch ebuild. Tighten up ffmpeg dependency to prevent...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index e5c7c2e4c9625e18cf781a8d1e1e7762f1d5b208..00f84cbd17bfc0e620fe76889c0f464160b6da98 100644 (file)
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.215 2011/07/26 09:27:55 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.216 2011/08/24 21:52:16 chainsaw Exp $
+
+*audacious-plugins-3.0.2 (24 Aug 2011)
+
+  24 Aug 2011; Tony Vroon <chainsaw@gentoo.org> -audacious-plugins-3.0.ebuild,
+  +audacious-plugins-3.0.2.ebuild:
+  Version bump to newest 3.x branch ebuild. Tighten up ffmpeg dependency to
+  prevent the breakage that Alessandro Surace pointed out in bug #377671.
+  Removed old ebuild.
 
   26 Jul 2011; Tony Vroon <chainsaw@gentoo.org>
   -audacious-plugins-2.5.3.ebuild:

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index e61b04e4e007f35ec3c2a3d8d18e59d87a74f997..d476dbf8d9a94977db5e3e6220a5e6aae962752d 100644 (file)
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c685c2b892 SHA1 33a43cdcb699578accbc181918b96da6ab04cedc SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4
 DIST audacious-plugins-2.5.4.tar.gz 3500309 RMD160 a2cf4b9407492758c7ee9b858c7c75b9d906c524 SHA1 8aedcc58c3b5a9415345374014d809ccb9a7541a SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8
-DIST audacious-plugins-3.0.tar.bz2 2263124 RMD160 c4b40f2eabb03d0896a75102a4ffb0a96b00cfe5 SHA1 e5a6cbbe8ba657956ec09442705eca6e1499ff0d SHA256 0c493cd7a75d9e2f4eebf6e31e390f449d2c3ea7571551cbd5d4783d222d2fb7
+DIST audacious-plugins-3.0.2.tar.bz2 2279700 RMD160 8f4505974d2059056fff73b386740a04d20069b1 SHA1 2b083d598f6fca9786854416b24989b948ad8584 SHA256 40d0044cc78dda8202b9226004e28c1953aab8504ecd544f0f880f4f455e3875
 EBUILD audacious-plugins-2.4.4-r1.ebuild 3531 RMD160 a93df94ec3a230388160482c2969774fd7cddab0 SHA1 7197ed03af5324a3006793b61ae272daeec722de SHA256 cb979f8810e5d741c7e24a750e5072ee8dfbbb95ba151b05f17f63829dfbdb4d
 EBUILD audacious-plugins-2.5.4.ebuild 3493 RMD160 dfebd62dfb1fae4f82b3b34da012235fafc3a238 SHA1 a2b16bfbca3804678444d1e7c4bf5ea084bbac04 SHA256 b7982a0b7c41c91d1104adc2f89540ff784421231f3c5a60ddaa70f0155203e8
-EBUILD audacious-plugins-3.0.ebuild 3494 RMD160 c47df8e35cc9a692937ef755fdf58c32f570125f SHA1 e2ef077d46e8a7ff39161c90b6a6097fc5dcd9f2 SHA256 072b9832e0ff940e5622245090975ea65dca5695fe110c5fbcd87ccbc9366cde
-MISC ChangeLog 45142 RMD160 7ba035eb3970fad3d1d3934d59fe2ffdf9042a8a SHA1 ba76c9568c0a2ba2d08688ef8f57b02d932fbcb1 SHA256 305fc964a905871e797f2f170343dd887b66811ff37ccb145ffab8ad4708b676
+EBUILD audacious-plugins-3.0.2.ebuild 3529 RMD160 3be7c178fe8e2b0510126db579d9e05582fc8cca SHA1 76038188ab8dfbf25d57b6feb15872387edbcd9f SHA256 4e0ff1b09236a9843687875d06ac9860d13bfbe5df38e912bd1343b8e404c2cb
+MISC ChangeLog 45469 RMD160 842602b78bdb6827d5b2ce6370af72207d7db89c SHA1 1c747f3a27587a8625e393c1e58ab0ac821f9f85 SHA256 a6fba452af2988353c16304817d0eebe5a8990283a3a4f10e8ed84b63bc7513d
 MISC metadata.xml 793 RMD160 6ed971d5b4c08275c3f0cad7f599431231d6d6e6 SHA1 73ed2881b74c9beaec7c99f8ca5e2f84d1a65b58 SHA256 487034ec4c5105e48198d65eeb4f3ba2600ebdb5d771e557a8d44e6d6a07fb48
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4uiJwACgkQp5vW4rUFj5pOBwCdFyD9SvldShuzJmLQ76X8kkgs
-ZQcAoLyQrzPqBbkxZfAqZlUCWhGFKTG2
-=CRgX
------END PGP SIGNATURE-----

diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.0.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild
similarity index 95%
rename from media-plugins/audacious-plugins/audacious-plugins-3.0.ebuild
rename to media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild
index 43128beeba8d4d432e1f14d9a7360d15b75cf083..b8d3819614fe0a52ffc463dd8a2c381b8e12bded 100644 (file)
--- a/media-plugins/audacious-plugins/audacious-plugins-3.0.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.0.2.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-plugins/audacious-plugins/audacious-plugins-3.0.ebuild,v 1.1 2011/07/25 12:52:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.0.2.ebuild,v 1.1 2011/08/24 21:52:16 chainsaw Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ lame libnotify libsamplerate lirc midi mms mp3 mtp nls oss pulseaudio scrobbler
 RDEPEND="app-arch/unzip
        >=dev-libs/dbus-glib-0.60
        dev-libs/libxml2:2
-       >=media-sound/audacious-3.0
+       >=media-sound/audacious-3.0.2
        >=net-libs/neon-0.26.4
        >=x11-libs/gtk+-2.14:2
        aac? ( >=media-libs/faad2-2.7 )
@@ -31,7 +31,8 @@ RDEPEND="app-arch/unzip
        cdda? ( >=media-libs/libcddb-1.2.1
                >=dev-libs/libcdio-0.79-r1 )
        cue? ( media-libs/libcue )
-       ffmpeg? ( media-video/ffmpeg )
+       ffmpeg? ( >=media-video/ffmpeg-0.7.3
+                 !media-video/libav )
        flac? ( >=media-libs/libvorbis-1.0
                >=media-libs/flac-1.2.1-r1 )
        fluidsynth? ( media-sound/fluidsynth )