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

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

4 files changed, 38 insertions, 19 deletions

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
new file mode 100644
index 000000000000..05b89d23acc3
--- /dev/null
+++ b/media-libs/phonon/Manifest
@@ -0,0 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX phonon-4.4-qt7.patch 15621 RMD160 dd46e1cac72aaffc714ef849c079eac1c9c03536 SHA1 f5902d8138fb550457d8acddebf24743cd5e5498 SHA256 8b236f3731434ec6fd591f7da6f1267943c819ebc523797b58d27facfafde68e
+DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606 SHA1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
+DIST phonon-4.4.3.tar.bz2 648733 RMD160 d7f36bf490acc595dabfd1f7fb1f4433cf77ccf8 SHA1 50262d590beb648be9dcad6b913b920db19a84f8 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
+DIST phonon-4.4.4.tar.bz2 362249 RMD160 4697907c406165524ddab66bd416cfcf214435d0 SHA1 7f31752c20efecbe63c7b312ceb28819fa337943 SHA256 4c1d74eb06d58757bd2d81c29a3e9e86ff2e0751c8b4beec5a3365dda34d85f6
+EBUILD phonon-4.4.2.ebuild 3203 RMD160 a0f49130f52e10cec11e1cceec4c65401cce4e7d SHA1 87543b810822b8fa7559245fc39656da33da1fdc SHA256 fb3e0e1061632acc710b8ff60829efaf24e4f3d86db32c739042f80fc1aadfd0
+EBUILD phonon-4.4.3.ebuild 3100 RMD160 d5d7c80c2fdcf0d08b31b20a644948001b0134ed SHA1 cf9b12c379e50f2d1bb68d86ca8f09015d83d5ed SHA256 5ccc7dd73b88c82892cd1a38b642f9d880ff4cc08fc8f2c67485e18009c9e399
+EBUILD phonon-4.4.4.ebuild 1519 RMD160 202f1a71f5a41a764e4a44fd16f247b1c10bb2f1 SHA1 c8d54d3b7b4d53d9b3e3172f73fb759396e0a836 SHA256 f14a3069bcad0bae391e5e9764934b820cbca0e9b9b83c33cf8222b2de4a8b50
+EBUILD phonon-9999.ebuild 1495 RMD160 ae9f49ab24459fa2a6a82c14b98045e8f5215e31 SHA1 114b862e4cdc945a7d183852877f51d5bff3f2bb SHA256 6f57e664e5d1e2965a576ff1633dbf7139edc1280f1db663e4dd0a662a994875
+MISC ChangeLog 9691 RMD160 5a847c8620a005fdbf3b7650ddaa9a015b14d126 SHA1 eee8e0f783afe955c245b1904222a4b10f45e123 SHA256 2b5ad95bbaa332d4956bd3fce1948aec9b1d4c6eb394ae371fc36ec5bb704e14
+MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNjg87AAoJENwGBM22xffeWXYP/2KmbHT8Y6cA6Ax5tggaZ6Rp
+o1X20puqC0Q5prBgOEK0WwcbWIWsHeI3yBFg91v2HQoKxEZfORED7r726KP1bmUI
+80Kd/jaxmwlNZKj8QoIarVugwQMrRH1ueGg26vBMIMDHwB9RHTETRRTWRXXv7yLr
+OhVpwW5gj6uIaJvt+KBRP9lh8QmTRECsyWa1dyeQCa7uL9XopvfvBKeHDGuRsdX6
+gGNFJjphuQBo0/5BO8JIsTYyhYLpSv0QEvrvVslCqMEYFbvzGPqTdh8ws73mS1Sh
+Ei5RTa2un+PdghnvpD1rYt7mBDp64MPRc0HYQWDzlse/Elw8w4/fISozysdDzAKR
+sVqSZf+BCmk+hzPc8zbIgQ9IsPeIpuktMw2Qfg+ylqD9as3PdZEEDXRUioSoEoXB
+9I2J/8LAHd7eymsqVFikV9BnPLHhXFUqH9oS210ERUWQZIluWBmxdnJ/3niYtMGs
+UYirGOd81bM9tL7bAK18VXgwwjonUfa8SwS67fGfyXivdatsuc7geZbPgNMdm0WH
+2GF3JNKIiOV6R5G/LOVYqSIlsN2pgHBDKKhfyL4Ar4OtY53nyjeXOR4c4eB+mtRN
+2/Cq6bbuWa0TobQrQneaQZvtNnPtQ6LbtE8z2aVjNzT2UJxl9pPe3D+i8oHFC4Ps
+m0n3MoiEKAoHzBl4JMI6
+=0o8p
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 93784d8097a9..3e5d5cdae4d6 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.639 2011/03/06 11:12:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.640 2011/03/26 16:04:05 scarabeus Exp $
+
+  26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> xine-lib-1.1.19.ebuild:
+  Depend on virtual/ffmpeg instead of media-video/ffmpeg.
 
   06 Mar 2011; Tim Harder <radhermit@gentoo.org> xine-lib-1.1.19.ebuild:
   Use slot dependencies for gtk+ and freetype.
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f9aa304d481a..5f733262fb18 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0
 DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
 DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
-EBUILD xine-lib-1.1.19.ebuild 5628 RMD160 653b4454fe936cd1b11ef71ee010701476e88e7e SHA1 078d6db8e56f16c27e912b53c8af488317dce34e SHA256 0390200836020a6790c51ed12baf413b765347e93cbd51bcc6c000e46938eeaf
-MISC ChangeLog 74076 RMD160 2dd6c13cea1f07afdc0198e3251f598bbdc52231 SHA1 926723269f8afe723ffd9237a57ffe80c6c7bc0d SHA256 bb0128b677fd11002d9955ba738686afecbcff669a980eec9d9fc67f743ae157
+EBUILD xine-lib-1.1.19.ebuild 5606 RMD160 672c9b7bab30fb53c603711ebd3394149be66a04 SHA1 827a6861e852f69b52163a6cff080aa146990362 SHA256 9ed7fdef4181b0e6fb2d062312828675274c4331e1ea886376c974a947bf060e
+MISC ChangeLog 74214 RMD160 5557c45f37b5d48b5b31cc20d22eda23919acc58 SHA1 d62dd40c1c3ba596f4924208d7c018eff7d100c8 SHA256 1b45c5f9d8a2c43995cfb63b59da34e74dd77aa232505b6101caa7f814d9d5be
 MISC metadata.xml 2913 RMD160 ea5722272700444f2ffe366feb88dfd0a18636df SHA1 97d2d10cc63bde0a4bfc46b9b8c4474ee0337b45 SHA256 4929566b88860ef0c53c15ed84ce5d8bbd36692461631fd3d4814dc9bc0807cf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNc2wuAAoJEEqz6FtPBkyjnZIH+gJx5C7x4ae+Crut2aZHXuBv
-s9fjdU7YN0NT8MKvNP0rAT89knc+i2/sR/bWZIzc8nxeVJRDteMdaX+9FTwBphL4
-04NLo0xFDL1daOPw2cysdNFzOkP8+t1UFNlnmLRSg7pEsfNQt7z1jz6aQ74XXiVX
-XyuaeWnZBtSIP5lf3ZkzA/h/tUaN9ftGOGaMfzXCWU3KOYLtAAnIA8WUJEor7SPM
-SCANQmxv/3su8uN+472tUt+Hx+/PBFTH0NnfrO9ipU4/RHzvwrsD2JEScPUsV/M5
-q2ERXNTW7pemMv21l+AIkdnP6MsJ2IF+3SJ9uesI2jhd5/7T1f338L+s9z92HCo=
-=vNZr
------END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.1.19.ebuild b/media-libs/xine-lib/xine-lib-1.1.19.ebuild
index 5b77a11fdd6c..7a18096375a0 100644
--- a/media-libs/xine-lib/xine-lib-1.1.19.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.19.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-libs/xine-lib/xine-lib-1.1.19.ebuild,v 1.10 2011/03/06 11:12:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.19.ebuild,v 1.11 2011/03/26 16:04:05 scarabeus Exp $
 
 EAPI=3
 inherit eutils flag-o-matic toolchain-funcs multilib
@@ -60,7 +60,7 @@ RDEPEND="X? ( x11-libs/libXext
 	imagemagick? ( media-gfx/imagemagick )
 	dts? ( media-libs/libdca )
 	aac? ( >=media-libs/faad2-2.6.1 )
-	>=media-video/ffmpeg-0.4.9_p20070129
+	virtual/ffmpeg
 	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
 	nls? ( virtual/libintl )
 	gtk? ( x11-libs/gtk+:2 )