provide a testdata tarball so that it doesnt try to redownload them in src_test

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 20 insertions, 8 deletions

diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 6682d4241784..fd2405c7b24d 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libvpx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.88 2013/06/25 18:35:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.89 2013/06/25 18:45:40 aballier Exp $
+
+  25 Jun 2013; Alexis Ballier <aballier@gentoo.org> libvpx-9999.ebuild:
+  provide a testdata tarball so that it doesnt try to redownload them in
+  src_test
 
   25 Jun 2013; Alexis Ballier <aballier@gentoo.org> libvpx-9999.ebuild:
   do not mess with MAKEOPTS, pass it to emake directly
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 707f0389737f..1fbd3e110522 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -5,15 +5,16 @@ AUX libvpx-1.1.0-arm.patch 1159 SHA256 173d50ecf7806683f5729db95bf204430d7bd791d
 AUX libvpx-1.1.0-chost.patch 1441 SHA256 ad4f06433f403bffbe6e72809cae7d63545bb19a034bf87d8a6c0d09b183546e SHA512 3591bcbf4535c608eab2ff51befe60b492e0f1b738aaa864a02c463b89abebb38dde6e683fb92f47f6d5f6139cbc1feced6464c5f4501bdbeb91cc5b39ac9f3e WHIRLPOOL ecac0141e9688a12854813dbe7c57746e4ba096c91e38435fcb3e9d5a289b9c1b9cfb2498f42b4def899997e86fcd7441771a4c9d0514f9e49447711a423a8be
 AUX libvpx-1.1.0-generic-gnu-shared.patch 1466 SHA256 411335557d7b8f04f53c971dc7654fa04a5beaeab8114b6222cbf23c8f33958d SHA512 82d78a5c8acdd16bbecb250d049446d8a0804094311feec0ffb85865e1a90d5895833a410d88d036dc653971b43b69fbe947ceb21f8b82d3a79e0325e31daf68 WHIRLPOOL a500811c5560846930d3781558e0079b2fbbb7c98e646e930782f37ce67571e49c37fe549aee0aea72a36e522a9d8ecaf21c421c72ad9d020ff60b0b57f9eb34
 AUX libvpx-1.1.0-x32.patch 1768 SHA256 931c23ed8d45c878943c6c7d9c647295962ab81d4b71a737063da95fd105b45e SHA512 87fa2fe4e7e47df1fe5eabc852937be1d893585b21d0533f80e33fcdacfa45edb66755ff31276d9d42d2922d2cb086c69a0c00c598df52fc171deaf5f5138373 WHIRLPOOL 9dce21ca3d1602c6ecc657eb2aa145c5a2dabfb360107f881a6668b1549194b3c24aab6bb8c6c0d1906f1b51fc6f97860629ebcc2fae175b9555e1606829c2bc
+DIST libvpx-testdata-1.2.0.tar.bz2 43521881 SHA256 41dc3eb8ad0b24177ccc43f7dd6ec7946f78e6aaa5ff94d0883487e02eb4da2c SHA512 77d909435137965d2d13d5bbd053e658664caa035dfc60b2ba91d075a37624ed27d75cac53f013c8043624fc9b56219ad0b0dd20dd4eecc471935b2757110637 WHIRLPOOL 19c3d8d27e03407098f9e9f3120c242b25bea442aa1fb1755b63fce875662ec00942949af3c5e499f6e18ccfef67f18e1403c226b288e925786ef6fc64e112e0
 DIST libvpx-v1.1.0.tar.bz2 1653485 SHA256 9ce074cf4b3bcd9a49ff93e05485b71c273bfc3685a305e55a0e7fa51beb72c5 SHA512 5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa WHIRLPOOL 2dc8164e3f812903a1b52901438857bcdf172cb1d979f1ced45933fc12ffbb0c49e2a6c02b0c6f3360f48b146e1e5c6ea25c1613abafc3089030f6c1e7af92ed
 EBUILD libvpx-1.1.0.ebuild 2530 SHA256 67231b8d32861e18070a1936f62892d9c339a2f91e587b73b984d660a4dae8c3 SHA512 bd43732385d6ceb483bebf0891c2fa2052f9593951578f106e9d412b9caed51e13ee3ac004b664b88990c0115d33737e0d5ee613691e949d4a1ee3c72b72fff1 WHIRLPOOL f43c7f458c14c347529ea67b469a2174f0ee6ef1655e818650f8e46942cc5de307f4f32f6001dd86255f0a1377c3d112d67e94baa3472892d7e9e37119212494
-EBUILD libvpx-9999.ebuild 2771 SHA256 b6d8e5d83cf9c8ff109801399c87a2a7ad1b6dbc0013b62c82e937b441b2d5e5 SHA512 bdc7444efdd2f7762440253b92c73e30f38a95525320922d2e6ecca29144aebba67d218d252b763d0af9f5f8f40d29f19585fd6ae6f08d245ce07f73300873b4 WHIRLPOOL fec7ab3f80622423de8ae95c1fd7c54e08cedb0f1b45d02418f334756d7ab76838e77881ccbc348eb610060e7c29bbc9a4df4be6b1f506d9ce6df1f764eb0b2e
-MISC ChangeLog 12969 SHA256 c600b74f51bd68a864f76ed7ad2c7f24f68ba711b36bfcd4159f75ae01d26097 SHA512 7e87ee1f5ceca0b8d39d345ef58281a6d47abd09f35a3d76c7c7416feb9ca7ea69620ee372dc2893ec6f6e608a79982110678f4d0a6b5f3e3cb6788561d043a5 WHIRLPOOL b55d671187bf9e28a21608aad4c1074ff53a46c6a55701a83cbcca404c227cf577b4298444ded1e66ee82eaa32e5159b74081999e6336d1b503950655980063d
+EBUILD libvpx-9999.ebuild 3005 SHA256 fc96587d3324b42bf5a6787466f64ed2a07fcfa717422144b61f39bcb0b57bff SHA512 fd74bb6a5d11007d440f66602267c8f3d14c35518583e7e525a69cc11bf3d32c43a8dba81ad04e78fb727fd7ca3a146ed18101bc56b3f7afe6d84cdea1b93b7b WHIRLPOOL 0ed1ebfca8855a4acdf9be1212ce88c84a94e2ce27545fc9f2af933de6b966c1ee77f25826046af70092e86bff249fbe11cda08c1b99542d5412006a22bb02ec
+MISC ChangeLog 13126 SHA256 7b0aaab9dc2effd000d3cba871cdc862dfacedd8c7efd71a5f6aa2ee7a7e02f8 SHA512 85e91d862076c578fbc79bb19874cf09b96acea6646a18267438a9065782c02143cb1ed580472b8a3c02b04a74ef5161548038f42fcd175f50bd9f7f2d440448 WHIRLPOOL 9b52fb71bf5804d3d792e6a49e4282f07d208400236b8ddd0919dc216807707bdea2617a330ee057bf070bcc371e33f63d48648138fd06457acfd42381bea3d1
 MISC metadata.xml 695 SHA256 9ce8ec472b7274e76137dcb0ee7881d478281161e56f5efc622b4a5eb85820e1 SHA512 19c4f1736767b4df3a0262d16a48b8c39aea5748ec7d6f87fde0231fcc26edf4b0953ba3d3ca0af226370481538958e1b37af91e4af4e6913d80d661ccaf3959 WHIRLPOOL 8c69f5f37908c5ed1d2c820a115e5a26a00282754424d0deadee1a05ff783ae8e62c08cb68c98030ca3f242a8fff8b475f1174cf7f9be441379956458376cea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHJ4v4ACgkQvFcC4BYPU0rtRACgmUNrnKO/VamyQxnC3oZPV7ES
-H4QAoJTI9M4785nesOSBr3UDy9Pram7z
-=eNsz
+iEYEAREIAAYFAlHJ5VYACgkQvFcC4BYPU0pSXQCfZttNCYf40/soD/qjiIMz9iae
+opQAn3Egp9h/Z8nkOhhrYCuP3Zvi4HPx
+=FeUk
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index cda89a63111a..97af3119959e 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.39 2013/06/25 18:35:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-9999.ebuild,v 1.40 2013/06/25 18:45:40 aballier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs multilib-minimal
 
+LIBVPX_TESTDATA_VER=1.2.0
+
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="http://git.chromium.org/webm/${PN}.git"
@@ -17,6 +19,8 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
+SRC_URI="${SRC_URI}
+	test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.bz2 )"
 
 DESCRIPTION="WebM VP8 Codec SDK"
 HOMEPAGE="http://www.webmproject.org"
@@ -95,7 +99,10 @@ multilib_src_compile() {
 	emake verbose=yes GEN_EXAMPLES=
 }
 
+multilib_src_test() {
+	emake verbose=yes GEN_EXAMPLES=  LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata" test
+}
+
 multilib_src_install() {
 	emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
 }
-