gentoo resync : 28.04.2021

10 files changed, 111 insertions, 106 deletions

diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index 6321e128a2a8..01a4ff288031 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,11 +1,11 @@
-AUX mpeg-tools-1.5b-64bit_fixes.patch 6986 BLAKE2B c9260ac02bfad853af227ff5cba05c8c4a932dd3461362a7fb6d817b049f0ce3407182777ed26ca3fae1849729217c01237c3ef3bcaff0490f5656fa6eae34a4 SHA512 8d8f596cf39c1e9535ae21f8399136189e0775cbe69146208654bf394b8524932a4961e99061c76ba195c20909ab6dc2f420a12b72862ebbc6c81d7e7c7c6cc6
-AUX mpeg-tools-1.5b-as-needed.patch 1526 BLAKE2B 823889c2cb6abe1683cd72e63b7a93cbf367d9cde130354f25ff30b3c17ed878d71fb830e7258c797c8d5579a722c4daa42d61d80aee9003236a8626c8ff268e SHA512 5874d5241ffb9ed6d6bc35774f6e643c141c8ec63811d8f761700acef816911220df20a943c739f4df4ce95783502f8963235ae4ecc0b66bd116a6daaa2aa5d1
-AUX mpeg-tools-1.5b-build.patch 1414 BLAKE2B 8a0f804f670fbd75617c38726149b2db0f3594c3082e5efd66877e4214bc8bc67eccca91aabd10cbedb84da1e92c2df7ec01a5b1cf7ca368f0fdf2bfad4c6726 SHA512 f2bfe1126926c6473a149ea120898eb252c681808cd2745bed5428164ebeabfb33218cb7f98b4a9930af9d88055ca067129f1a4ffede824d5d6179762f27a4d7
-AUX mpeg-tools-1.5b-jpeg.patch 1498 BLAKE2B 32e421efe289622e34fc7387f4c56de65e210297c60a69a792a56a5e66eb8918f9df82628b705a4f98af70bc1c952dacd6f883af90eedea083170e65e6a7a8b1 SHA512 9bc509c603e825d94372f866fced352149d5d003c2ee247eb356db22f80bbf6cfbfcaaf03fb7a104ff84548e52f0f3034619e15598d0ae04df36d4b4332ea18b
-AUX mpeg-tools-1.5b-powerpc.patch 1041 BLAKE2B 9297129f0a028174c9c58f5b9e5af22fd8597c9a9d5e430ad0deacfa4f8378f2ba57ac3a1086398186187c5055f71cff3bdac903a404fd13ce0e251fe9d9a859 SHA512 f0ee310dce12d9137186b7d99aa88282cb65838855820ad3642bf090194be07d5f6cfef509561d1e097a938e68a6c2f8c61536a1921d08df458c66b83c6eaeca
-AUX mpeg-tools-1.5b-tempfile-convert.patch 4097 BLAKE2B f60e5bb386c468827024162cc50135fb0cfb858d2f4a373fc6ee9d4f465915be7c7206d1b8c75a1c47695cc2fdf1737979c4749bb97aa5da17c7fd1c12e336df SHA512 b90879e884e9f5a5bd61149adda293c149e533b8fdb969b6e6d579917b2abed0fb848629f1567782d80c97dcf40eaf3c005731d216c02d1e97d54543c74e6e2d
-AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538 BLAKE2B 4bbc67856c745ea320a6ae70e3ce43db54b044f360c00a94e84582d30d07eeb419dccf47d6b0ec47884004861751383531c119547c11707e924a9e537ee83f5b SHA512 229fcd4e28628fa8d45a20766e6b46bcf2e3a6ea9e69b2e8764b180b2766d539a701c64a7969a4020805a06188825c5fa5a5e1146052ee6a52edbb7d3d572f1e
-AUX mpeg-tools-1.5b-tempfile-tests.patch 5256 BLAKE2B bf52a2bc69f42af32cc6e0aecd910d6c37e12c0a9391d18dd4fff9e7304a99550b9c0a08c608aa6b3bfeda14166caeabb154c6ff7af7c4c307dc23796c46dfc5 SHA512 ee616fc5b4b4bf15e547d737a00a4349fff98127c5ec836e63ae5b6b3e365c50b6cba1c535fd27de2ce6ee28ef5bd3872f5d3b7880f39fe23c7e8ebdc24508e8
+AUX mpeg-tools-1.5b-64bit_fixes.patch 6914 BLAKE2B 4b9c42f10bc8e44dd402233a933c523cb5fdf15802575e762efacb5f165efeaff45ebfdfc414f6819c9f959301bf6844d7cdc7488145e7ee76192d34cbc6f08b SHA512 1d45ceb3b5bcd8c536b0d1f5a29e2e010dcc0bbff687588e795772188100fe2370e42ff889b649912c97363cd112db0ef4bd1ea22b13b6c5d4cf5b62ba9f2465
+AUX mpeg-tools-1.5b-as-needed.patch 1524 BLAKE2B e153902331f7c58c7e9a10f7c9c6cb95a801d96b4961ffa43a2aae8cd8fa10096c391a87540c76e478a7e164834baa243c442aa44b38d9794ab0aa3ece2a2df5 SHA512 9bfa844b66a0eee2c025e1e01cb8802d4ea0fb2d5a4f8172c10516732a9edb5b02877b0e8d4298f5e8d2bdbe46ab1b067562c067cbd866a921b7f76032da7a65
+AUX mpeg-tools-1.5b-build.patch 1349 BLAKE2B c724711b8f6c43f537995e78b134da59eeb1101ebac0e38422389f819ca74f1ae528bb14e6cf723135576b9b60fec157fa6cfb0364ebad4b13a4b31f966f88bf SHA512 e1854262fcb1a3373c7ba907e672eaa4432c0c5e5d963df0174bc01010cbfdb5ea1679102ed905daaf3ef0171a93097a5ee20638c37a45149c57e4fcf26f0271
+AUX mpeg-tools-1.5b-jpeg.patch 1554 BLAKE2B 69de8a65db7e8a005ccce41b19ba749f7721005bfa93d12eab1b2b1e9148fa049b0dc1548a213938ff962b2efec86d53c7fe2db532ad7d6c26bd3a92e73da43e SHA512 ad87f8cc38342c62ac47fea8b9e6b1beaad5a7fef0059336b41d7222c720fae00edbcaf7cd4eb8fb3f7d7bfc03df82db9928a9c3efbc542dadf94c1d5ee10ad7
+AUX mpeg-tools-1.5b-powerpc.patch 973 BLAKE2B 932e71d12e33f53e9c14513b4c3fbf91db08954eaaacca7c3cb1a0dc5fc8457b71457c86efd5952928aa15cedc78ba36e9765d7eb19e42ea9d8fa39362d0fc1e SHA512 a3a7447f57a5d83e6cc25551186d03a8a89b956185e3457ef46ff2a9c594a8a0ca2f1f0a2a5da0299a70b40b3d52f2254d25e46465c899315149a9bc3f410a39
+AUX mpeg-tools-1.5b-tempfile-convert.patch 4117 BLAKE2B 0ef961ec23cb88da70d1317a43a38fcf95d58554664a078ebf81d0546ec085ceae5934122c8e6633a9d79efe82ff43c0283940fa6ff54e0dfc2c90205eabb3bf SHA512 8af3a8c8116243380faa9b628e743e1d266e762d0aa9dc3c15ca2b95a4c3d15b57b84f0bb7ce49c426cb3c1e87ebbe777358083d7e09a6150ae79cdda7c12e92
+AUX mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2546 BLAKE2B e5c1f72de985dbfd3eb28f9fdcded691d498cc8106a65c3020e0d9c8fd312ef6875e6541a1bfaa684c23925bd53903259d90ed6176416ff953451a4cba158c02 SHA512 08e1fed266b3b921a214cd0d881ebe219b79a7b7b3044abe9348a7d2ec28a7b7ad50c538a64cc6818839724923bb7bd021614ca8f9fe5d23c0e419f2c549beee
+AUX mpeg-tools-1.5b-tempfile-tests.patch 5304 BLAKE2B c23b571b117c0dfc5e115dfa47b318051859ab758fb4a77f482deac5d470001d1cd289717d779133e961024a17677fcbe4cf224b18ce2c104d37197f7d268841 SHA512 3942aa4d6d4935d7401b422837df254fabdc37c9b1c1d42fe978e746f1b74a6964990f14bf0905b3963e180c90b32e4b7150079137635e6c2a42c357f1472f7e
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 BLAKE2B 6758a34bbc7a967311f710277b37d6f7612b9f4be429e0909d623b33ff83e7c10a8f7de9de3dcbc69080a23f6312b611315732eede649165873c50e92d53f639 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469
-EBUILD mpeg-tools-1.5b-r5.ebuild 1788 BLAKE2B 9a8ca3d9486b3f0bdfb31411d8bbb4579b219f76b774e13b348b314c3460b213341a8bd77659610142b5f846df790b36bc7c4814fd19a46d76d14466ca9c4b22 SHA512 f2f00e951318bf3dc3e2a628320e6f3885e9fe604ea926a97f17fc8b367f2530c47b3e2d899a6148a2b0836b99da24442a5b8015f26e0cbc52088d24ca11b77c
+EBUILD mpeg-tools-1.5b-r5.ebuild 1758 BLAKE2B fccbc220d9e73d136b5b70614cb9887d10ad6aba42988c93de27745ea3f452857ceb8ee9d9a44ce45d4d1c72c8b9fd6050aba3853d274ca719fafcc0af925efb SHA512 480f536ae7cbbdee5a3b9f5ead46d89cfe5d9c71a9ce8f0abaecb4d540d272a0db6b7f71472a9f59b9be0ed8d9e3fe69ebba4e5eaa82c8145a2ee8dca2f797d7
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
index fa2e70304dbe..d1f25884453a 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-64bit_fixes.patch
@@ -1,5 +1,5 @@
---- work/convert/eyuvtojpeg.c
-+++ work/convert/eyuvtojpeg.c
+--- a/convert/eyuvtojpeg.c
++++ b/convert/eyuvtojpeg.c
 @@ -22,6 +22,7 @@
  /*==============*
   * HEADER FILES *
@@ -25,8 +25,8 @@
  }
  
  
---- work/convert/eyuvtoppm.c
-+++ work/convert/eyuvtoppm.c
+--- a/convert/eyuvtoppm.c
++++ b/convert/eyuvtoppm.c
 @@ -22,6 +22,7 @@
  /*==============*
   * HEADER FILES *
@@ -53,8 +53,8 @@
  }
  
  void Usage(void)
---- work/convert/mtv/archdep.h
-+++ work/convert/mtv/archdep.h
+--- a/convert/mtv/archdep.h
++++ b/convert/mtv/archdep.h
 @@ -45,16 +45,46 @@
  			    ((char *)(to))[5] = ((char *)(from))[2];	\
  			    ((char *)(to))[6] = ((char *)(from))[1];	\
@@ -104,8 +104,8 @@
  /* Define types of specific length */
  typedef char		i_8;
  typedef short		i_16;
---- work/convert/mtv/movieToVid.c
-+++ work/convert/mtv/movieToVid.c
+--- a/convert/mtv/movieToVid.c
++++ b/convert/mtv/movieToVid.c
 @@ -295,7 +295,7 @@
      exit (0);
  }
@@ -121,8 +121,8 @@
      fprintf (stderr, "done\n");
 +    return 0;
  }
---- work/convert/ppmtoeyuv.c
-+++ work/convert/ppmtoeyuv.c
+--- a/convert/ppmtoeyuv.c
++++ b/convert/ppmtoeyuv.c
 @@ -39,6 +39,11 @@
   * HEADER FILES *
   *==============*/
@@ -152,8 +152,8 @@
  }
  
  
---- work/mpeg_encode/bitio.c
-+++ work/mpeg_encode/bitio.c
+--- a/mpeg_encode/bitio.c
++++ b/mpeg_encode/bitio.c
 @@ -79,6 +79,8 @@
   * HEADER FILES *
   *==============*/
@@ -163,8 +163,8 @@
  #include <assert.h>
  #include "all.h"
  #include "byteorder.h"
---- work/mpeg_encode/jpeg.c
-+++ work/mpeg_encode/jpeg.c
+--- a/mpeg_encode/jpeg.c
++++ b/mpeg_encode/jpeg.c
 @@ -65,6 +65,8 @@
   *==============*/
  
@@ -174,8 +174,8 @@
  #include "all.h"
  #include "mtypes.h"
  #include "frames.h"
---- work/mpeg_encode/headers/libpnmrw.h
-+++ work/mpeg_encode/headers/libpnmrw.h
+--- a/mpeg_encode/headers/libpnmrw.h
++++ b/mpeg_encode/headers/libpnmrw.h
 @@ -20,9 +20,6 @@
  ** that point here, feel free to tweak or remove these declarations.
  */
@@ -186,8 +186,8 @@
  /* End of configurable definitions. */
  
  
---- work/mpeg_encode/libpnmrw.c
-+++ work/mpeg_encode/libpnmrw.c
+--- a/mpeg_encode/libpnmrw.c
++++ b/mpeg_encode/libpnmrw.c
 @@ -27,6 +27,9 @@
  /* #define MSDOS */
  #endif
@@ -220,8 +220,8 @@
    register bit* bP;
  
    switch ( format )
---- work/mpeg_encode/opts.c
-+++ work/mpeg_encode/opts.c
+--- a/mpeg_encode/opts.c
++++ b/mpeg_encode/opts.c
 @@ -35,6 +35,7 @@
   * HEADER FILES *
   *==============*/
@@ -230,8 +230,8 @@
  #include <stdio.h>
  #include <string.h>
  #include "opts.h"
---- work/mpeg_encode/iframe.c
-+++ work/mpeg_encode/iframe.c
+--- a/mpeg_encode/iframe.c
++++ b/mpeg_encode/iframe.c
 @@ -235,6 +235,8 @@
  int SetFCodeHelper _ANSI_ARGS_((int sr));
  void CalcDistortion _ANSI_ARGS_((MpegFrame *current, int y, int x));
@@ -241,8 +241,8 @@
  int
    SetFCodeHelper(SR)
  int SR;
---- work/convert/jmovie2jpeg.c
-+++ work/convert/jmovie2jpeg.c
+--- a/convert/jmovie2jpeg.c
++++ b/convert/jmovie2jpeg.c
 @@ -33,6 +33,9 @@
  ************************************************************************/
  
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
index 58c74e124f09..0d0c24fa5038 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-as-needed.patch
@@ -1,5 +1,5 @@
---- convert/Makefile	2009-08-25 21:19:42.000000000 +0200
-+++ convert/Makefile.new	2009-08-25 21:22:54.000000000 +0200
+--- a/convert/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ b/convert/Makefile	2009-08-25 21:22:54.000000000 +0200
 @@ -53,13 +53,13 @@
  all: $(TARGETS)
  
@@ -17,8 +17,8 @@
  
  wc:;		wc -l *.[ch] *.pl *.table
  clean:;		rm -f *.o core *~ gmon.out $(TARGETS)
---- convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
-+++ convert/mtv/Makefile.new	2009-08-25 21:24:31.000000000 +0200
+--- a/convert/mtv/Makefile	2009-08-25 21:19:42.000000000 +0200
++++ b/convert/mtv/Makefile	2009-08-25 21:24:31.000000000 +0200
 @@ -15,12 +15,12 @@
  default: movieToVid
  
@@ -34,8 +34,8 @@
 -	$(PURIFY) $(CC) $(OBJ) -o movieToVid.purify
 +	$(PURIFY) $(CC) $(LDFLAGS) $(OBJ) -o movieToVid.purify
  
---- mpeg_encode//Makefile	2009-08-25 21:19:43.000000000 +0200
-+++ mpeg_encode//Makefile.new	2009-08-25 21:27:12.000000000 +0200
+--- a/mpeg_encode/Makefile	2009-08-25 21:19:43.000000000 +0200
++++ b/mpeg_encode/Makefile	2009-08-25 21:27:12.000000000 +0200
 @@ -203,7 +203,6 @@
  ############
  
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
index 70a96c439e9c..146c602dc522 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-build.patch
@@ -1,5 +1,5 @@
---- convert/Makefile
-+++ convert/Makefile
+--- a/convert/Makefile
++++ b/convert/Makefile
 @@ -24,7 +24,7 @@
  #CC = cc
  
@@ -25,8 +25,8 @@
  vidtoppm: vidtoppm.c
  	$(CC) -lXvid -lX11 $(INCLUDE) -o vidtoppm vidtoppm.c 
  
---- convert/mtv/Makefile
-+++ convert/mtv/Makefile
+--- a/convert/mtv/Makefile
++++ b/convert/mtv/Makefile
 @@ -4,7 +4,7 @@
  
  PURIFY        = $(PURIFYHOME)/purify
@@ -45,8 +45,8 @@
  
  clean:
  	rm -f core lintout makeout tags Makefile.bak *.o \
---- mpeg_encode/Makefile.orig	2005-09-26 16:01:51.000000000 -0400
-+++ mpeg_encode/Makefile	2005-09-26 16:02:11.000000000 -0400
+--- a/mpeg_encode/Makefile
++++ b/mpeg_encode/Makefile
 @@ -97,5 +97,5 @@
  
  #	gcc
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
index 633321879e8d..faade2d46bbc 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-jpeg.patch
@@ -1,5 +1,5 @@
---- jpeg.c
-+++ jpeg.c
+--- a/mpeg_encode/jpeg.c
++++ b/mpeg_encode/jpeg.c
 @@ -77,13 +77,10 @@
  
  /* make it happier.... */
@@ -30,8 +30,8 @@
    
    for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
        cp++,compptr++) {
---- Makefile
-+++ Makefile
+--- a/mpeg_encode/Makefile
++++ b/mpeg_encode/Makefile
 @@ -36,9 +36,9 @@
  ##############
  # JPEG STUFF #
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
index 3eb2d5f15a60..ed2f57c0fad0 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-powerpc.patch
@@ -1,5 +1,5 @@
---- convert/mtv/archdep.h	2010-03-11 04:35:04.596642403 +0000
-+++ convert/mtv/archdep.h	2010-03-11 04:34:38.949974604 +0000
+--- a/convert/mtv/archdep.h
++++ b/convert/mtv/archdep.h
 @@ -17,7 +17,7 @@
   * Note that these macros *do not* work for in-place transformations.
   */
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
index 2bab1511bf59..7ee852aed311 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-convert.patch
@@ -1,5 +1,5 @@
---- convert/eyuvtojpeg.c
-+++ convert/eyuvtojpeg.c
+--- a/convert/eyuvtojpeg.c
++++ b/convert/eyuvtojpeg.c
 @@ -25,6 +25,7 @@
  #include <string.h>
  #include <stdio.h>
@@ -41,8 +41,8 @@
  }
  
  
---- convert/vidtoeyuv.c
-+++ convert/vidtoeyuv.c
+--- a/convert/vidtoeyuv.c
++++ b/convert/vidtoeyuv.c
 @@ -125,9 +125,9 @@
    XImage *ximage;
    char *tdata;
@@ -81,8 +81,8 @@
  
        for (j=0; j<nth-1; j++) {
  	if (read (fd, &image, sizeof(image)) != sizeof(image)) {
---- convert/vidtojpeg.c
-+++ convert/vidtojpeg.c
+--- a/convert/vidtojpeg.c
++++ b/convert/vidtojpeg.c
 @@ -123,9 +123,9 @@
    XImage *ximage;
    char *tdata;
@@ -121,8 +121,8 @@
    }
  }
  
---- convert/vidtoppm.c
-+++ convert/vidtoppm.c
+--- a/convert/vidtoppm.c
++++ b/convert/vidtoppm.c
 @@ -220,9 +220,11 @@
  
  
@@ -148,8 +148,8 @@
 +    unlink(tempfile);
    }
  }
---- convert/eyuvtoppm.c
-+++ convert/eyuvtoppm.c
+--- a/convert/eyuvtoppm.c
++++ b/convert/eyuvtoppm.c
 @@ -100,13 +100,9 @@
      fpointer = fopen(dest, "w");
      if (fpointer == NULL) {
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
index 1b33bc5dd1c8..9462e6f26eff 100644
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
+++ b/media-video/mpeg-tools/files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch
@@ -1,5 +1,5 @@
---- mpeg_encode/parallel.c
-+++ mpeg_encode/parallel.c
+--- a/mpeg_encode/parallel.c
++++ b/mpeg_encode/parallel.c
 @@ -586,6 +586,8 @@
   * SIDE EFFECTS:    none
   *
@@ -40,8 +40,8 @@
      } else {
        Frame_AllocYCC(frame);
  
---- mpeg_encode/readframe.c
-+++ mpeg_encode/readframe.c
+--- a/mpeg_encode/readframe.c
++++ b/mpeg_encode/readframe.c
 @@ -227,14 +227,22 @@
   * SIDE EFFECTS:    none
   *
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 260f279d2d4b..709f497b5fb0 100644
--- 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
@@ -2,8 +2,8 @@ When running tests, don't use /tmp for obvious reasons
 
 Also rewrite the diffscript in sh since csh isnt always available
 
---- mepg_encode/Makefile
-+++ mepg_encode/Makefile
+--- a/mpeg_encode/Makefile
++++ b/mpeg_encode/Makefile
 @@ -187,16 +187,16 @@
  #########
  
@@ -28,8 +28,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  ############
  # BINARIES #
---- mepg_encode/tst/diffscript.sh
-+++ mepg_encode/tst/diffscript.sh
+--- a/mpeg_encode/tst/diffscript.sh
++++ b/mpeg_encode/tst/diffscript.sh
 @@ -0,0 +1,16 @@
 +diff $1 $2 > ./foobar
 +egrep Blocks ./foobar > ./blockbar
@@ -47,8 +47,8 @@ Also rewrite the diffscript in sh since csh isnt always available
 +	echo "FAILURE! (different exection).  Please send bug report."
 +	exit 1
 +fi
---- mpeg_encode/tst/test_all
-+++ mpeg_encode/tst/test_all
+--- a/mpeg_encode/tst/test_all
++++ b/mpeg_encode/tst/test_all
 @@ -1,19 +1,19 @@
 -#!/bin/csh -f
 +#!/bin/sh
@@ -78,8 +78,8 @@ Also rewrite the diffscript in sh since csh isnt always available
 -csh diffscript /tmp/tsd.stat tsd.stat /tmp/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
+--- a/mpeg_encode/tst/diffscript
++++ b/mpeg_encode/tst/diffscript
 @@ -3,23 +3,23 @@
  #
  # NOTE:  if this script doesn't work, then basically all you need to know
@@ -114,8 +114,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  		echo "SUCCESS."
  	else
  		echo "FAILURE! (different output -- probably endian bug).  Please send bug report."
---- mpeg_encode/tst/ts.param
-+++ mpeg_encode/tst/ts.param
+--- a/mpeg_encode/tst/ts.param
++++ b/mpeg_encode/tst/ts.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -125,8 +125,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/tsd.param
-+++ mpeg_encode/tst/tsd.param
+--- a/mpeg_encode/tst/tsd.param
++++ b/mpeg_encode/tst/tsd.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -136,8 +136,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/gop.param
-+++ mpeg_encode/tst/gop.param
+--- a/mpeg_encode/tst/gop.param
++++ b/mpeg_encode/tst/gop.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -147,8 +147,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/short.param
-+++ mpeg_encode/tst/short.param
+--- a/mpeg_encode/tst/short.param
++++ b/mpeg_encode/tst/short.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -158,8 +158,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/ts2.param
-+++ mpeg_encode/tst/ts2.param
+--- a/mpeg_encode/tst/ts2.param
++++ b/mpeg_encode/tst/ts2.param
 @@ -2,7 +2,7 @@
  
  PATTERN		IBBPBBPBB
@@ -169,8 +169,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/ts3.param
-+++ mpeg_encode/tst/ts3.param
+--- a/mpeg_encode/tst/ts3.param
++++ b/mpeg_encode/tst/ts3.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -180,8 +180,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/ts4.param
-+++ mpeg_encode/tst/ts4.param
+--- a/mpeg_encode/tst/ts4.param
++++ b/mpeg_encode/tst/ts4.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
@@ -191,8 +191,8 @@ Also rewrite the diffscript in sh since csh isnt always available
  
  YUV_SIZE	352x240
  
---- mpeg_encode/tst/tstl.param
-+++ mpeg_encode/tst/tstl.param
+--- a/mpeg_encode/tst/tstl.param
++++ b/mpeg_encode/tst/tstl.param
 @@ -1,7 +1,7 @@
  # test suite parameter file
  
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
index 8da82cd441af..acd331b70b3f 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r5.ebuild
@@ -1,37 +1,42 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PN=mpeg_encode
 DESCRIPTION="Tools for MPEG video"
 HOMEPAGE="http://bmrc.berkeley.edu/research/mpeg/mpeg_encode.html"
 SRC_URI="ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/${MY_PN}-${PV}-src.tar.gz"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
 	virtual/jpeg:0"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_PN}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-64bit_fixes.patch
+	"${FILESDIR}"/${P}-tempfile-convert.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-powerpc.patch
+	"${FILESDIR}"/${P}-jpeg.patch
+	"${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
+	"${FILESDIR}"/${P}-tempfile-tests.patch
+)
 
 src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-64bit_fixes.patch
-	epatch "${FILESDIR}"/${P}-tempfile-convert.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-powerpc.patch
-	cd "${S}"
-	rm -r jpeg
-	epatch "${FILESDIR}"/${P}-jpeg.patch
-	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
-	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
+	cd .. || die
+	default
+	cd "${S}" || die
+
+	rm -r jpeg || die
+
 	# don't include malloc.h, but use stdlib.h instead
 	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:' \
 		convert/*.c convert/mtv/*.c *.c headers/*.h || die
@@ -51,7 +56,7 @@ src_install() {
 	docinto examples
 	dodoc examples/*
 
-	cd ../convert
+	cd ../convert || die
 	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
 	newdoc README README.convert
 	newdoc mtv/README README.mtv