Migrate to virtual/ffmpeg in all versions.

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

8 files changed, 34 insertions, 31 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 6e71d6f9ecac..b69c2e7259cc 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.244 2011/03/28 08:13:33 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.245 2011/04/04 12:31:27 scarabeus Exp $
+
+  04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mpd-0.15.8.ebuild,
+  mpd-0.15.15.ebuild, mpd-0.15.16.ebuild, mpd-0.16.1-r1.ebuild,
+  mpd-0.16.1-r2.ebuild:
+  Migrate to virtual/ffmpeg in all versions.
 
   28 Mar 2011; Christoph Mende <angelos@gentoo.org> mpd-0.16.2.ebuild:
   Changed ffmpeg to virtual/ffmpeg and some minor cleanup
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index dd18bd837c3b..1637ecd88853 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 0.15.1-mpdconf.patch 2912 RMD160 6683618151f0f10dc94b5563a48be3729919ef08 SHA1 fc67f59f808d77332a20261525ca74bf1d67b228 SHA256 cacecca8580bce38f998a9f3fa867c274bb112a9af8c59b8dfcbd23a45d34523
 AUX mpd-0.16.conf.patch 2655 RMD160 ad8a9eb214c1c446505becedfe2587bd1997cbaa SHA1 d695f1a8d885e5f44f394e39a76a0d700b955ab6 SHA256 c6b9573c035fb3aace9a0d5277503d7ca6184d92798fbb3f17dd85596e0926fd
@@ -11,18 +11,18 @@ DIST mpd-0.15.16.tar.bz2 392986 RMD160 8b5e627e9a52702003e0cd57806d78a195d711af
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
 DIST mpd-0.16.1.tar.bz2 480244 RMD160 f96ecb6a337043ea4982a2fa609d026b0d571647 SHA1 328d6d1e118e7d0029535559b2ae87ac10b79d6e SHA256 b85ca840e31aea2249ad8e9c5c36f6533fc0f88d357a7441817ccacb1e31df57
 DIST mpd-0.16.2.tar.bz2 478096 RMD160 74e63fe4514eb8309bf2b2e4e4012566e14b6262 SHA1 ce0b8cd473f8acb45c06d73f41c18fc4dabbe440 SHA256 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5
-EBUILD mpd-0.15.15.ebuild 4818 RMD160 ad1404ce8a9391dfd102156a377318795b828bc4 SHA1 1b81e4b29232c2bfc751e1fcbdf332fba1e3caea SHA256 f072f0ed5f5350ac33bc39a0cfab2865e5dbd7055310f8c0ef934ff7d4017a67
-EBUILD mpd-0.15.16.ebuild 4822 RMD160 36024de0158db3f2766519ab49031058c4351686 SHA1 ada86d45f6392e4cd555225a1c618cb6a01182a7 SHA256 17926b55b0b928b150b5354533dbe2a99ca8f03da1429d9dcee089c315331de3
-EBUILD mpd-0.15.8.ebuild 4863 RMD160 9e8f822f4d14afad7236f3f4d71f699003e1ca33 SHA1 e015c81dd883a457bb761755d8d2ec50f224c336 SHA256 f6816267b72be8934f8cb156a1e287dad1d815b4373a1869c9bc865ee1d7b06e
-EBUILD mpd-0.16.1-r1.ebuild 5212 RMD160 195e74c78a11b19437b34d0980d0f5b95d79a1b6 SHA1 67471c4a459e5efb5023167565c3f2cc559cc677 SHA256 d9c20bbfd3b990f3429e772f627eb43d217e777d2dbb05408ef049a562bca704
-EBUILD mpd-0.16.1-r2.ebuild 5540 RMD160 2effae36f38f07a549c865bcfc784359f395b449 SHA1 f2d0e6fa8d61c127f6125e529eb2e75b94020ab9 SHA256 7932652d7e8da805787e60657ce5d3fb43ddf19460e4ab728b6c32e9f6b7b3fa
+EBUILD mpd-0.15.15.ebuild 4813 RMD160 fd26ff630f9c2b360cd94bb997273cab95aaa52c SHA1 963f9042dce960c37c2814285520696152f6dd23 SHA256 2414ac619334672ef86e09b9c5a64661cd9048aab636bbb377c356a98b90f092
+EBUILD mpd-0.15.16.ebuild 4819 RMD160 973f692023189f10213019c33ebd1765ecf1aaeb SHA1 e7e035666afaa0761dd8545e20be6e193c246520 SHA256 599e58e655e46e611cdb1c9327e38c7e07a70735e9cf254b799f3445a8c77190
+EBUILD mpd-0.15.8.ebuild 4861 RMD160 cf2764ad1e04af2add4217f7e25a2e2e3b9886a7 SHA1 49d19c0a2a114b0c62f37827e868bb675ff5a9f8 SHA256 aefbea8453384affd0ca0832bdf8e7eba8e934c5cfb1c76b75407946a759f75b
+EBUILD mpd-0.16.1-r1.ebuild 5209 RMD160 1e7a966cdd4e4510d971fc02087d18ed6ce6cc49 SHA1 b723a8251ff01ccc67949292553d91bf75ba2109 SHA256 910e8e835f43e6a2e13864378a414b308ebc2fb666ca4bab625b8fc11895f8d3
+EBUILD mpd-0.16.1-r2.ebuild 5538 RMD160 5e7ffc1ab715c024a868457e8af5f84b350c8ad0 SHA1 333388bbb739dfe9a11b7a3e9ba6148184d75779 SHA256 581b98a13a7e0245d08789a4a684b939f1533a11f6a741f5978d78c16c7fafd9
 EBUILD mpd-0.16.2.ebuild 5418 RMD160 960d3f3cd49a4786362f376a091fd9d98c23786a SHA1 f150ada3250696e419e0455efa270f5082c8f7f0 SHA256 015662a2628570ad25d3547483b81d68af79797dcf80d33da08d94786aaab770
-MISC ChangeLog 35652 RMD160 4eb03ea02ded4b486678617ac304aed8f209cdb3 SHA1 4fe619954b2fb5013d6f896c9915e61d50e1c7e1 SHA256 7d2e60c823727825e52f83eb4ed1ff53e636c0191c79c1d4791938b28dc68250
+MISC ChangeLog 35862 RMD160 9e912840e9baaaef5d5a947c2d05c61f5066a0fc SHA1 7223f385d9b06637461a5c6dcb14ccf6b3a6ee7a SHA256 8d057cf7015cb94750b7ec6b4847726a41cf369177a88fd39dd555f477308a0a
 MISC metadata.xml 1519 RMD160 4231c2d53cf47048c4638a9d49b48f7f72212550 SHA1 423766ff1530f40ef17a2c84c92add1ffe4a7d62 SHA256 f8c901bf6b4e25af758178c8b91d043771418ba112d435973b7ead5bd5151bec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2QNP4ACgkQmWq1bYTyC0N5FAD/S2kCqmi3JrWjDq7mIqxKx0D0
-edoletep8VW4YdDzT0sA/0Waj9xtoGn/G/lo3UIG0ysyo1zeTyhIFUwKNpd3JHFa
-=vFrO
+iEYEARECAAYFAk2ZuKwACgkQHB6c3gNBRYeWFACgkOXS2wOjSHt3dUhtKQJi7kQ2
+mp0AoLtM49jcIM19KAMoiYl+q7lbBIwN
+=IP75
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/mpd-0.15.15.ebuild b/media-sound/mpd/mpd-0.15.15.ebuild
index d28ac84c0b59..ce27d0003552 100644
--- a/media-sound/mpd/mpd-0.15.15.ebuild
+++ b/media-sound/mpd/mpd-0.15.15.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/mpd/mpd-0.15.15.ebuild,v 1.10 2011/03/16 19:30:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.15.ebuild,v 1.11 2011/04/04 12:31:27 scarabeus Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -27,7 +27,7 @@ RDEPEND="!sys-cluster/mpich2
 	cdio? ( dev-libs/libcdio )
 	cue? ( >=media-libs/libcue-0.13 )
 	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	network? ( >=media-libs/libshout-2
diff --git a/media-sound/mpd/mpd-0.15.16.ebuild b/media-sound/mpd/mpd-0.15.16.ebuild
index c1f44fd10821..ff2380b37ffe 100644
--- a/media-sound/mpd/mpd-0.15.16.ebuild
+++ b/media-sound/mpd/mpd-0.15.16.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/mpd/mpd-0.15.16.ebuild,v 1.1 2011/03/14 22:19:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.16.ebuild,v 1.2 2011/04/04 12:31:27 scarabeus Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -27,7 +27,7 @@ RDEPEND="!sys-cluster/mpich2
 	cdio? ( dev-libs/libcdio )
 	cue? ( >=media-libs/libcue-0.13 )
 	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	network? ( >=media-libs/libshout-2
diff --git a/media-sound/mpd/mpd-0.15.8.ebuild b/media-sound/mpd/mpd-0.15.8.ebuild
index 63ccd4137e59..6f27bcf018cb 100644
--- a/media-sound/mpd/mpd-0.15.8.ebuild
+++ b/media-sound/mpd/mpd-0.15.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/mpd/mpd-0.15.8.ebuild,v 1.7 2010/05/01 11:20:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.8.ebuild,v 1.8 2011/04/04 12:31:27 scarabeus Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -27,7 +27,7 @@ RDEPEND="!sys-cluster/mpich2
 	cdio? ( dev-libs/libcdio )
 	cue? ( >=media-libs/libcue-0.13 )
 	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	network? ( >=media-libs/libshout-2
diff --git a/media-sound/mpd/mpd-0.16.1-r1.ebuild b/media-sound/mpd/mpd-0.16.1-r1.ebuild
index ee9aeda9f0b9..9849125436f1 100644
--- a/media-sound/mpd/mpd-0.16.1-r1.ebuild
+++ b/media-sound/mpd/mpd-0.16.1-r1.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/mpd/mpd-0.16.1-r1.ebuild,v 1.1 2011/01/14 09:36:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.1-r1.ebuild,v 1.2 2011/04/04 12:31:27 scarabeus Exp $
 
 EAPI=2
 inherit eutils flag-o-matic linux-info multilib
@@ -27,7 +27,7 @@ RDEPEND="!sys-cluster/mpich2
 	cdio? ( dev-libs/libcdio )
 	cue? ( >=media-libs/libcue-0.13 )
 	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	network? ( >=media-libs/libshout-2
diff --git a/media-sound/mpd/mpd-0.16.1-r2.ebuild b/media-sound/mpd/mpd-0.16.1-r2.ebuild
index 387506c3c3c5..bf611f7a35fd 100644
--- a/media-sound/mpd/mpd-0.16.1-r2.ebuild
+++ b/media-sound/mpd/mpd-0.16.1-r2.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/mpd/mpd-0.16.1-r2.ebuild,v 1.2 2011/02/28 17:26:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.1-r2.ebuild,v 1.3 2011/04/04 12:31:27 scarabeus Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -33,7 +33,7 @@ RDEPEND="!sys-cluster/mpich2
 	cdio? ( dev-libs/libcdio )
 	cue? ( media-libs/libcue )
 	curl? ( net-misc/curl )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( virtual/ffmpeg )
 	flac? ( media-libs/flac[ogg?] )
 	fluidsynth? ( media-sound/fluidsynth )
 	network? ( >=media-libs/libshout-2
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 6e01a46d8fca..424225af5a15 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -4,17 +4,15 @@ Hash: SHA1
 DIST xwax-0.7.tar.gz 47167 RMD160 2c15a51027ba2ec25b4953a49e4953864400f279 SHA1 a94e4b9b60c81b9ebd74f85be0717007eb6ddadf SHA256 c2274ec002d157ee51494b6c6eaf2a5429f6c007f000defdfcbd5a9e39b75362
 DIST xwax-0.8.tar.gz 47660 RMD160 ce974475cc7b36d9362513f0951adff00c11569c SHA1 f72199faf79cea9025b69daf703a1b6e51140d76 SHA256 552ebbac9edfc6d85b269ca49170cf7f89b48702e683da6ab02f8878bfa8fd58
 DIST xwax-0.9-beta3.tar.gz 51177 RMD160 5ee2b9d3425892520f206a951143707c7c31f999 SHA1 849e59e8d0979bff20d4ff0c89e778d737f2cbd4 SHA256 9d3f7f779c4097feec26b7d96a6d644b193dd561378ef41ad524c15135dd87bc
-EBUILD xwax-0.7.ebuild 2721 RMD160 f0c1ed8b4785fa7caf74abe15c320aebab16b49b SHA1 22bc6dd64850a9d95da27543a694b54a820fdf27 SHA256 edcfc124d4f07cebb89be5fae6ff2960b5eed5b99c01bb66ca74acda09989d01
-EBUILD xwax-0.8.ebuild 2654 RMD160 bb66aa769d82b91dae722e65bc008deb190fc4ec SHA1 1a86c2a5ebe5aa5a07a4c373574e70c74c445177 SHA256 c9f7f32bf99df52c7cd7adbb22b08d747392f7bc41d409cdc2b2bac5d1e3b59c
-EBUILD xwax-0.9_beta3.ebuild 2722 RMD160 ee954e6710de3ec63391d239d2f5d1e82288e5ee SHA1 3443d1c73804c2c57affa810ef9b69218717cb58 SHA256 600dc1c2b6be6a07bc52402ac0d615900b96d2ba5a64c6c8958170e270f2b137
-MISC ChangeLog 4284 RMD160 b6a9cc86aff8228816fec13dd96f6c1d1c475b12 SHA1 2974398554adbca679d34cf7713e9334e77041f9 SHA256 0c1e8aa631366e39d7d06f1cc16187c4442f893078344fc024fd588453c3a972
+EBUILD xwax-0.7.ebuild 2720 RMD160 8f67ca9757f5423dfd5f4c2d27b5b47dd7378639 SHA1 3139c48fe0fdbc0eab32e2cc67633f41afe98b7d SHA256 622a60aa16691a70d4a5c940bb5bdd36a08f0e6616be913b1ff90f58c7170a61
+EBUILD xwax-0.8.ebuild 2649 RMD160 55827c6da33928640b0364a965c554c2217455c2 SHA1 cbb38885588ed643c23d212a24a32f4ed9801e31 SHA256 0be55923bdcb2b1c90cdc0d28a8a968962c6b67283a4bf14fb45409cd755e177
+EBUILD xwax-0.9_beta3.ebuild 2718 RMD160 81a9851279530b793f1d9ccee66396c68f08b09a SHA1 524c7067ee39b5262d3577998e0969140e243020 SHA256 97d6b5f71e298097377f64d1ef2395dd02b84b2fabfbffee6f1c4ec7b97f4a1f
+MISC ChangeLog 4451 RMD160 c9f43d25e711a7815693643b8ce1be75de4e0afb SHA1 1401554c05316fb8930a64635c221b2452aa97da SHA256 6f535bfa94a82f64d8fdc373004e162dc727af8526bb3e17a7fda970383de3ec
 MISC metadata.xml 951 RMD160 0fbeebdaa2cd21809d5d91d422f15518652693b7 SHA1 d5e698d35c2b339c0bdf0a26dd11830b701a7f84 SHA256 b7e433deaf2a12d7d8550f3732ed2d6506672d4fa6b81b169c843782ddea7b30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2KRWkACgkQIiMqcbOVdxTzoAP+Ih8t5e7koCQG6uK14AocJxN0
-nbHX9wB76UK48vxVIh6ELW1ugMay9PkShco1Fdbc9Rsw0r/YiU7HbK2JK3+lc1Nb
-33ih9cpDS4i7nLLRAk7HfxzKctafvwo9DjoNvzSlyIw13M1xejnuE61UobUjg7yW
-oN1WulBe1QwQGLqMxBk=
-=uDw2
+iEYEARECAAYFAk2ZuSIACgkQHB6c3gNBRYcMngCeNZQtQyQhubUc+rGPe7rpxTmq
+0t8AmwQzb19bWfBy7Cx12t1CBwVEJHFm
+=z7w0
 -----END PGP SIGNATURE-----