fix paths so the tests actually work

Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501

diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 7a24fb83b5d3c1b9d65fdbc90978ec3055a77cf1..665ff74b988f3e574f8324c28948212539c02f0c 100644 (file)
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -13,7 +13,7 @@ MD5 44b911d91abb56f60d64cc8b07074b11 files/mpeg-tools-1.5b-build.patch 1414
 MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b-r2 73
 MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b-r1 73
 MD5 ac3d41c507a2fc1b1cfcf8ca91e1e983 files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538
-MD5 b6d276af6f148879e1569d6ea5d2077a files/mpeg-tools-1.5b-tempfile-tests.patch 5269
+MD5 f7cc407da44caa2318d26dab75f3459a files/mpeg-tools-1.5b-tempfile-tests.patch 5256
 MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b 73
 MD5 ee6ac6a97ef340aecff643f24bc2f02c files/1.5b/mpeg-tools-1.5b-gentoo.patch 560
 MD5 1c465916c02ad5e984eefda8b236fbc9 files/1.5b/libpnmrw.c 37348
@@ -22,7 +22,7 @@ MD5 1f0b9c5d21516dc0b597bdd8563a7e39 files/1.5b/libpnmrw.h 6791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDOJTJgIKl8Uu19MoRAhDUAJ9gsQREkmJjxvwJcDmtAYyFupS8mQCdFpZ6
-JuurYPYoLi4GUEKbIl1OsmM=
-=Q8PH
+iD8DBQFDOJcfgIKl8Uu19MoRAlCEAJ4wKlxn7yYRcTe5vVye6Zeb2iJ/DgCfS7C9
+NRF1bub974fy/QNwe72gWU4=
+=Op/+
 -----END PGP SIGNATURE-----

diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
index d766786b6eed3e231152dc76c37fd236d9f17e9c..260f279d2d4b871d0c04e549dc0885ecfa564e82 100644 (file)
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-tests.patch
@@ -31,12 +31,12 @@ Also rewrite the diffscript in sh since csh isnt always available
 --- mepg_encode/tst/diffscript.sh
 +++ mepg_encode/tst/diffscript.sh
 @@ -0,0 +1,16 @@
-+diff $1 $2 > ./tst/foobar
-+egrep Blocks ./tst/foobar > ./tst/blockbar
++diff $1 $2 > ./foobar
++egrep Blocks ./foobar > ./blockbar
 +
-+if test ! -s ./tst/blockbar ; then
-+      diff $3 $4 > ./tst/foobar.mpg
-+      if test -s ./tst/foobar.mpg ; then
++if test ! -s ./blockbar ; then
++      diff $3 $4 > ./foobar.mpg
++      if test -s ./foobar.mpg ; then
 +              echo "FAILURE! (different output -- probably endian bug).  Please send bug report."
 +              exit 1
 +      else
@@ -50,7 +50,8 @@ Also rewrite the diffscript in sh since csh isnt always available
 --- mpeg_encode/tst/test_all
 +++ mpeg_encode/tst/test_all
 @@ -1,19 +1,19 @@
- #!/bin/csh -f
+-#!/bin/csh -f
++#!/bin/sh
  cd ..
 -echo "First we encode three mpegs... (note requires 5MB on /tmp)"
 -rm -f /tmp/ts{,2,d}.{mpg,stat}
@@ -67,15 +68,15 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  echo "Test one - tst/ts.param"
 -csh diffscript /tmp/ts.stat ts.stat /tmp/ts.mpg ts.mpg
-+sh diffscript.sh ./tst/ts.stat ts.stat ./tst/ts.mpg ts.mpg
++sh diffscript.sh ./ts.stat.new ts.stat ./ts.mpg.new ts.mpg
  
  echo "Test two - tst/ts2.param (different pattern)"
 -csh diffscript /tmp/ts2.stat ts2.stat /tmp/ts2.mpg ts2.mpg
-+sh diffscript.sh ./tst/ts2.stat ts2.stat ./tst/ts2.mpg ts2.mpg
++sh diffscript.sh ./ts2.stat.new ts2.stat ./ts2.mpg.new ts2.mpg
  
  echo "Test three - tst/tsd.param (uses decoded frames)"
 -csh diffscript /tmp/tsd.stat tsd.stat /tmp/tsd.mpg tsd.mpg
-+sh diffscript.sh ./tst/tsd.stat tsd.stat ./tst/tsd.mpg tsd.mpg
++sh diffscript.sh ./tsd.stat.new tsd.stat ./tsd.mpg.new tsd.mpg
  
 --- mpeg_encode/tst/diffscript
 +++ mpeg_encode/tst/diffscript