media-video/vlc dependency x264 pkgmove

Package-Manager: portage-2.1.5_rc2
RepoMan-Options: --force

5 files changed, 15 insertions, 21 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index bb0d1a0a2706..cc352e50ea6d 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.323 2008/04/07 20:51:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.324 2008/04/07 22:31:40 yngwin Exp $
+
+  07 Apr 2008; Ben de Groot <yngwin@gentoo.org> vlc-0.8.6e-r1.ebuild,
+  vlc-0.8.6f.ebuild, vlc-0.9.0_alpha20080319.ebuild:
+  Pkgmove x264-svn to x264
 
   07 Apr 2008; Markus Meier <maekke@gentoo.org> vlc-0.8.6f.ebuild:
   amd64/x86 stable, security bug #214627
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 4c87a8dda12e..a03e507332c3 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST vlc-0.8.6e.tar.bz2 11098938 RMD160 f09bae196a7b22cdc6013c5fc22dd6f82d60737a SHA1 6b981ddbe7f6b95cd566ee195b4445b5773c21bd SHA256 e80b5af8e78889a67698d086da33779ed78b64c1387237282432d303c1809c3b
 DIST vlc-0.8.6f.tar.bz2 11433698 RMD160 c52d0cb7e8ba36f9d0959b9d6e1e8b1b36b71b04 SHA1 9684bb7504636d3e3143734698c2bbac250f4a03 SHA256 23efbf3777f1f719034f2f0a5ab67d69acd9d5a49f0014afea7b0a8b74effe14
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
@@ -8,15 +5,8 @@ DIST vlc-patches-48.tar.bz2 5839 RMD160 1ef334b9b8fccaad37647a9bd8d0f5dcb8f725da
 DIST vlc-patches-50.tar.bz2 11374 RMD160 96797cdda6e2bb02bbc4569b7055fb697cc17f03 SHA1 68f6989e6b41ec144bf506252796379ccee598c3 SHA256 f6f8b806df747db54b7d72b57e610d321b19f57d6d976388b0d01a200500015e
 DIST vlc-patches-51.tar.bz2 8867 RMD160 def58f3ac0872e6848089af3fb1c5ce6e3fc878e SHA1 425be66b0e02610366348fcdca782bd81e0032c0 SHA256 a1c89d2749fc340a93d96beaab6f2a979e0cc59ed2f8e9f93bbc87e0c713000a
 DIST vlc-snapshot-20080319.tar.bz2 13608730 RMD160 c95ecac419a83846f12b5248808c9e279c871aee SHA1 f2ef963a862421faf9c1be1b8aa9a6c791324f78 SHA256 d7450c6900e5c0b874bc2a116b857ba81b8736193c6af21a8700862f3f105e25
-EBUILD vlc-0.8.6e-r1.ebuild 8868 RMD160 02dae24383c1e7ca6a48946ea61428c0eb4cc621 SHA1 a3887ade7a349a26b08ac45811d8608ec105552b SHA256 e35ffe5936ee00c39351f830df551257c9b040b0f3adf6d5981538b817ba6018
-EBUILD vlc-0.8.6f.ebuild 9099 RMD160 09bbc7d517d30b27850d1de69b1967a28181b501 SHA1 02071fe0e2eb710c2ff20141a505ed8c3d94c3fa SHA256 0b5805c018dcd11357ad69390015e2cadb9752d87983589ffdb3660083875ecd
-EBUILD vlc-0.9.0_alpha20080319.ebuild 10410 RMD160 f250aacec07fc6098bd9b68ad9c7d2700f8bb16b SHA1 b081e6e1a0d9f42b145c51799d91729b8b28c090 SHA256 507cf4e4c481b34f9c37a0861f2205ffac5fb767aba68e238fc28a2db2449570
-MISC ChangeLog 54618 RMD160 82f2b80eaa258f9315ddc98fdc8ec967a9f39ebd SHA1 b12f065572fffa15a39568de65ed251d92689761 SHA256 24681fcf77c8f1c24f479dee53391d3363030516d974dfb42107c89c451e75b7
+EBUILD vlc-0.8.6e-r1.ebuild 8851 RMD160 8b1d581c7c547c1e5e7c55eb5e76b086987ccefb SHA1 e7c826a70db19235b338ca4540f71ee42487c018 SHA256 60610347fc652710bd5886a7858cd310b19e6bed8adbbeb936fa64faa8a7a384
+EBUILD vlc-0.8.6f.ebuild 9084 RMD160 7d98d9dc58dab1f069c7bfe36f449f3c18d5cfb7 SHA1 6ea3bfc043f53e83df0925524abd62bc30a612e2 SHA256 2c1b7498901391d177bb8f147ac84e5ad905b4e6b7859a15a33e444214c8a29d
+EBUILD vlc-0.9.0_alpha20080319.ebuild 10393 RMD160 5eff4ea0ae22d0ef063426fd94e519b511f9a59d SHA1 d91009899b99c87934b114dda2e441e38c2a0777 SHA256 dc752a2e0d13adba066fabd3ccc74957619570d12eaefd13549d1bbfee2e5046
+MISC ChangeLog 54769 RMD160 6d5f7e8281024e2739431e427cd5ea83bcf3ced7 SHA1 e1c9f9a426ea2c464e6ee8fdb9e1f1d3f7fadd18 SHA256 b918a20e6153561b7c65e9a0c62fe0232721489fabe79833231aa5178718f380
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf6iZUACgkQkKaRLQcq0GLu5wCdFiRlGaw2b+7mWxFQS7kFR8VU
-Z0UAnA6SCKX/NRCoeG32rF/g9UvgSNjm
-=Rwa7
------END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.6e-r1.ebuild b/media-video/vlc/vlc-0.8.6e-r1.ebuild
index 42d5dad651e1..d95fcf0c62d3 100644
--- a/media-video/vlc/vlc-0.8.6e-r1.ebuild
+++ b/media-video/vlc/vlc-0.8.6e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6e-r1.ebuild,v 1.7 2008/03/27 11:36:27 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6e-r1.ebuild,v 1.8 2008/04/07 22:31:40 yngwin Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -114,7 +114,7 @@ RDEPEND="
 		)
 		libnotify? ( x11-libs/libnotify )
 		musepack? ( media-libs/libmpcdec )
-		x264? ( >=media-libs/x264-svn-20061014 )
+		x264? ( media-libs/x264 )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
 		dc1394? ( sys-libs/libraw1394
 			<media-libs/libdc1394-1.9.99 )"
diff --git a/media-video/vlc/vlc-0.8.6f.ebuild b/media-video/vlc/vlc-0.8.6f.ebuild
index 4c92395255a0..22fa8767f56c 100644
--- a/media-video/vlc/vlc-0.8.6f.ebuild
+++ b/media-video/vlc/vlc-0.8.6f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6f.ebuild,v 1.3 2008/04/07 20:51:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6f.ebuild,v 1.4 2008/04/07 22:31:40 yngwin Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -115,7 +115,7 @@ RDEPEND="
 		)
 		libnotify? ( x11-libs/libnotify )
 		musepack? ( media-libs/libmpcdec )
-		x264? ( >=media-libs/x264-svn-20061014 )
+		x264? ( media-libs/x264 )
 		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
 		dc1394? ( sys-libs/libraw1394
 			<media-libs/libdc1394-1.9.99 )"
diff --git a/media-video/vlc/vlc-0.9.0_alpha20080319.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080319.ebuild
index 6acd097dd919..9066cb51bf43 100644
--- a/media-video/vlc/vlc-0.9.0_alpha20080319.ebuild
+++ b/media-video/vlc/vlc-0.9.0_alpha20080319.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080319.ebuild,v 1.1 2008/03/19 22:38:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0_alpha20080319.ebuild,v 1.2 2008/04/07 22:31:40 yngwin Exp $
 
 EAPI="1"
 
@@ -137,7 +137,7 @@ RDEPEND="
 			xinerama? ( x11-libs/libXinerama )
 			opengl? ( virtual/opengl )
 		)
-		x264? ( >=media-libs/x264-svn-20061014 )
+		x264? ( media-libs/x264 )
 		xml? ( dev-libs/libxml2 )
 		xosd? ( x11-libs/xosd )
 		"