Depend on virtual/ffmpeg instead of media-video/ffmpeg.

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

4 files changed, 20 insertions, 16 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index b9f23b2729aa..3b1596265021 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.152 2011/04/19 02:13:49 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.153 2011/04/19 02:18:40 radhermit Exp $
+
+  19 Apr 2011; Tim Harder <radhermit@gentoo.org> audacity-1.3.8.ebuild,
+  audacity-1.3.12.ebuild:
+  Depend on virtual/ffmpeg instead of media-video/ffmpeg.
 
 *audacity-1.3.13 (19 Apr 2011)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 0f056ad51c42..936cb8421585 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -12,19 +12,19 @@ AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f2
 DIST audacity-minsrc-1.3.12-beta.tar.bz2 6087920 RMD160 47dd021c24fb6ed05a845604db28056d981c28d3 SHA1 3df2187c9e869be6745fb1e1396586b9b0486485 SHA256 f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
 DIST audacity-minsrc-1.3.13-beta.tar.bz2 6450901 RMD160 36c7e8b6dbd5dbfd265afe00fd7ea6e34894a29e SHA1 47a1340699958c8e1804f374209835be865d7027 SHA256 4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
-EBUILD audacity-1.3.12.ebuild 2795 RMD160 192a0794f22f5f9978655ca7f8ee040ed0ce386e SHA1 a4345e100fdc9a63b811365d695315e882a91de0 SHA256 63a0cb8297423b3a19aa99889fde48c57b0a2d52abeccb8c3a1e1492e6bf3791
+EBUILD audacity-1.3.12.ebuild 2772 RMD160 3626dbb4cec3c2e14d4d3f828499a82ddaf7f6c6 SHA1 d897f91815c794e26b8507286447ed68b74e066e SHA256 f220192354e2c266e8a05ac50d0b0446409632a6849bff852bdeb4e170f15390
 EBUILD audacity-1.3.13.ebuild 2575 RMD160 de50b9f621bd66165a37d52ce546b74e01bb84d6 SHA1 daf3a91ff438bd89b233bad9c72cf47da26143c2 SHA256 6037f7dcf20153f1acee29594d5860832211468f6031a06683622c5dc236d9c2
-EBUILD audacity-1.3.8.ebuild 2699 RMD160 185af076fe1282edbc9967806ccddb6e1cc308a1 SHA1 627e347be9963b0d3bb72ece4a18ff0e95ae5144 SHA256 a9c2115cf926a3a6eff6f97d1ec24b2e2b1f7a580093001af446afebd3211df0
-MISC ChangeLog 25399 RMD160 26679f3d82a1563b8191d503981cd35ecb91ba63 SHA1 fff5fc52759e73e79b1c02a9273b2c5982614154 SHA256 a0f1d17c573ae22682bb49faeef35a7fbbcbf5421011e00d6327ce177e259b16
+EBUILD audacity-1.3.8.ebuild 2677 RMD160 89512b1e82eadf2f21a530071ffbf439e7998f3a SHA1 96b1b2f80905e5012f80fcb910711546582b8f74 SHA256 3d6eae20c95271a3d6625245594a5f6a6c5ec41023b747daca05b6ec42e3fb6f
+MISC ChangeLog 25556 RMD160 8e6aa28f44d5d08da916289d34b7043246cbb031 SHA1 fa2fa854100799d6ca03650c35d03d5a5a3a335d SHA256 678f37f99421c3d522ceff2864bd73b6b3a08f60f48416eac86b42d316d9eeeb
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNrO/mAAoJEEqz6FtPBkyjoD4H/iqepiNUYNzbiIuiLcCoDTaJ
-AmJQfdEdbZ6zxlU0RDAIQC6hhJ+Ka52j+0faMBlSWdYl+kVNI6csaOqyGfYBCOQ4
-UVyoHMZrTUZmYt1wgaDUZ8IVaaZzg06jV7DBXALtCtQJj5FgKz2oDsVbhwHGJSH5
-pTtV3auGe3XV6MqbGWYx4KGQdvcODdjuzTyCtccxpWwh1d1YywzBpT2uzpm8w06d
-Kac6/YGd2f76al0G/i8pW/djjGPpChGbsqS0c60V3EeQn3WOOD9Ws5QjgSr0BdSc
-qjUuiIgdNT+C26W0JFs1M/kNCO1YP+GSWU1FtGPPp/IIMccr3y4O94Qxt+UxVLk=
-=E8RP
+iQEcBAEBAgAGBQJNrPEGAAoJEEqz6FtPBkyjDEcIAKzk/v7Umq0ms0ejBOUTMtuv
+ylHzMsmxVGCSICzmXwduAEXh2U2i6zaDDTVe7EJKA/JnA+mt9JGW/Jm/jkj+pkST
+M/habwdV1KofKPdCSFr/Xr1SwuRjAqpQ86g8/hWSkNpS5+davDVE7HHvAJApmXPJ
+2XX87sxHlLOVEk8UWxQQO/3fJ+YyPVsXo+zDH+aB2WdIwVihE27Nb5DB9+le8zXk
+08SZLzu9tnmZculliyzH6/uD9T4sTCPuvFQLQ6rfWxRFteRGnhT9ZqmYXb/9YrPp
+T0BLNfKZxvZjxLskFt0VYi0yXJAl8pVrhWR+xycieHpc+oF2+XgW44UlgGMXjGA=
+=MtVD
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.12.ebuild b/media-sound/audacity/audacity-1.3.12.ebuild
index 9d3aa8db154c..9db13bb0d946 100644
--- a/media-sound/audacity/audacity-1.3.12.ebuild
+++ b/media-sound/audacity/audacity-1.3.12.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/audacity/audacity-1.3.12.ebuild,v 1.10 2011/03/24 15:59:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.11 2011/04/19 02:18:40 radhermit Exp $
 
 EAPI=2
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
 	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
 	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
 	twolame? ( media-sound/twolame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
+	ffmpeg? ( virtual/ffmpeg )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
 # Crashes at  startup here...
diff --git a/media-sound/audacity/audacity-1.3.8.ebuild b/media-sound/audacity/audacity-1.3.8.ebuild
index 8fc6e381ebfd..a9b1047cfe59 100644
--- a/media-sound/audacity/audacity-1.3.8.ebuild
+++ b/media-sound/audacity/audacity-1.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.8.ebuild,v 1.8 2010/10/27 03:09:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.8.ebuild,v 1.9 2011/04/19 02:18:40 radhermit Exp $
 
 EAPI=2
 
@@ -32,7 +32,7 @@ COMMON_DEPEND="=x11-libs/wxGTK-2.8*
 	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
 	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
 	twolame? ( media-sound/twolame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080617 )
+	ffmpeg? ( virtual/ffmpeg )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
 # Crashes at  startup here...