Move to use libav in live mplayer ebuild and snapshot preparator. Force due to unsynced tree.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 11 insertions, 7 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index e76ea7cfec57..eba581d3b64d 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.783 2011/03/20 11:19:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.784 2011/03/20 22:12:45 scarabeus Exp $
+
+  20 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+  files/prepare_mplayer.sh:
+  Move to use libav in live mplayer ebuild and snapshot preparator.
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org>
   mplayer-1.0_rc4_p20101114.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index cbe7c9ff897e..74a426124dff 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,5 +1,5 @@
 AUX mplayer-1.0_rc4_p20091026-arm_neon.patch 591 RMD160 339c545419fd815a4b2aa1db9214620ce1b90f85 SHA1 219300d43e567fb3a0df9388798015bef09ddc01 SHA256 71d95820bc0d61a16469e42fa2fe42d4c46ca5339876f926259ed390cbbc899c
-AUX prepare_mplayer.sh 705 RMD160 134dfd4945acc2f8fba9274254f914fe1d493f97 SHA1 6c645f81fa70abe66769b17d9c60a1120eecbf9e SHA256 8132830acc2752c707ab056e9011b97e8382eee0d83a60dfc899dba301793131
+AUX prepare_mplayer.sh 703 RMD160 596e2645e7ce052d1e78b53086f2b4d1e6180c40 SHA1 95ded38e230810c365a7d53cb6ceda5a694c185b SHA256 ffccdae484e481371bbb9cba4587395c8569f6d0dcca00374568c721a4258a64
 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8
 DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
@@ -13,6 +13,6 @@ EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18994 RMD160 703252f6fa80d26861cdfa52
 EBUILD mplayer-1.0_rc4_p20101114.ebuild 20160 RMD160 8fca301ab531dfd14859270f1b3837210cf42b88 SHA1 512c53c4c12394b3fbc3e682680e56c62f7b9d16 SHA256 335c46b86747cd5d345ea6c8b9d828eb3ed9618327f3b9d97fbdb16141d03140
 EBUILD mplayer-1.0_rc4_p20101219.ebuild 20170 RMD160 eaf9ba0c48f420361e1e9ee678d58f636b7022e4 SHA1 e8d0d50037e34e1d701d9b17a89dd012e219331a SHA256 f8127f97c387ad15636e8c1f7777aee88b6bf54ab9eba197b1775103825f1983
 EBUILD mplayer-1.0_rc4_p20110302.ebuild 19693 RMD160 75cfaed8755581ac8d1f1234c5addb55603beb39 SHA1 cd8cc76823d6ff01518ad634874bf2ae063be889 SHA256 2c03b734c6463b54b11f7138cf15538658c60109ba25b1e9bea05f88add95490
-EBUILD mplayer-9999.ebuild 19635 RMD160 dc03b70e9491cfebdabfd288d5b7a8ddbe2cd44c SHA1 570791f3bef0234357f12b2d4b82f4c22f742782 SHA256 7764f90d7fb5d207ae7050caa27eff20d634e6a330aaef641ce76ec6710f6d3e
-MISC ChangeLog 137730 RMD160 f683725ff5c674745a3c3d7dbc038ad280a3529e SHA1 26a014319c769bfb0e4a0205b88f0c10371dd4ac SHA256 9f1da805dbdf82d0b7cd4c0e2c7a40d5f0a3f8891ce15e3f1ed1ad4f5ead87a1
+EBUILD mplayer-9999.ebuild 19633 RMD160 3c5f8a3655f6f9b89269bb0fc3a4ea03370fd707 SHA1 fd7c748344912763ef5947049282075ce8932386 SHA256 9ff5ab353e2ee9ed4fa461571494913c4c6fdf616f27451d503c0cb602f4c668
+MISC ChangeLog 137905 RMD160 35b6a84aa563cb4e0bd22e907453bf54cd18d544 SHA1 60246618bb1ce49d881872e799c845c825fe7392 SHA256 9b9b449953a8aa5bd9840601d5f4d042f8485eb55edf513b0bb7df7eb4584438
 MISC metadata.xml 4002 RMD160 ffe9c287d3f9757d086dd59a57abbaa50bbf7ff5 SHA1 ffba30bdc398c9515384344d40998e3e333319c4 SHA256 759874a20b3d4a0509f5fb18b9a4809a1e190ac3d3c74d9757faec3a024fd5e6
diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
index 2518f2ebf6a5..138af6305107 100644
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -7,7 +7,7 @@ svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE}
 pushd ${PACKAGE} > /dev/null
 	# ffmpeg is in git now so no svn external anymore
 	rm -rf ffmpeg
-	git clone git://git.ffmpeg.org/ffmpeg.git
+	git clone git://git.libav.org/libav.git
 	STORE_VERSION=$(svn log -r HEAD -q |grep ^r |cut -d' ' -f1)
 	echo "*** Remember to adjust mplayer ebuild with revision: \"SVN-${STORE_VERSION}\" ***"
 popd > /dev/null
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 752c502ea13b..00ad70dc9eb1 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.93 2011/03/02 16:54:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.94 2011/03/20 22:12:45 scarabeus Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git"
+EGIT_REPO_URI="git://git.libav.org/libav.git"
 EGIT_PROJECT="ffmpeg"
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
 [[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""