gentoo resync : 14.12.2020

4 files changed, 0 insertions, 133 deletions

diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index ae1ed99efbd3..6321e128a2a8 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -3,12 +3,9 @@ AUX mpeg-tools-1.5b-as-needed.patch 1526 BLAKE2B 823889c2cb6abe1683cd72e63b7a93c
 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-system-jpeg-7.patch 907 BLAKE2B 9ab472d932b3c1d69e1912b5eeb6fec4d03d06b16e083461d86d955c6ea3ddbff8a6f12f7974dc7b153a107ac5c4a3982f17902d537e4460792fe15e8fa75b3a SHA512 010460117a835092a42ab0a7b7f7d04dabe3ff691452541db204d34f1459e72060045af10dee4cb1c953235eb6ab2184fbe7aa032e8672454fc96c5f1d1ecde9
-AUX mpeg-tools-1.5b-system-jpeg.patch 893 BLAKE2B 0f6655d5725b978a73728150c44426bbb3151f9abfd5b72b0923bdceb5d0e028bd88a91b645c3ccbcd8f52e3149c4a1484ef6ebddfb30836752c45c6f5ed1649 SHA512 243bc75aabcdcdd1024ad33edde6dbb48e3e4ded355b54f09244792d4d854a736b69d858da5b496c059cd5e28c7ac4a2e764129a0812025ab59caf59082de787
 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
 DIST mpeg_encode-1.5b-src.tar.gz 2028724 BLAKE2B 6758a34bbc7a967311f710277b37d6f7612b9f4be429e0909d623b33ff83e7c10a8f7de9de3dcbc69080a23f6312b611315732eede649165873c50e92d53f639 SHA512 df6f9def3ba05c752ebdc5311c512688d6fae380480009dad55b4183a378685eca79943c075166b21ed3bfd0cce7697761abc6ec795f57c0ed1c60c2a5cba469
-EBUILD mpeg-tools-1.5b-r4.ebuild 1842 BLAKE2B a23ef178e3df72c6288aa236892fb4704f6b797f2edaf88d52e90682aac11f8bb28bb101be7ea77897e256a3b128581be0a51d6710bd86370115cb7bf4a0af64 SHA512 c8e87b1d6a4b1383903356b0d861ac856ca05ac14208ce3655b9f4339a451765515f9d4f6d4ba2ae9e7e5c06723ef987988b3e73e5235e4fcf876155fa91a7d4
 EBUILD mpeg-tools-1.5b-r5.ebuild 1788 BLAKE2B 9a8ca3d9486b3f0bdfb31411d8bbb4579b219f76b774e13b348b314c3460b213341a8bd77659610142b5f846df790b36bc7c4814fd19a46d76d14466ca9c4b22 SHA512 f2f00e951318bf3dc3e2a628320e6f3885e9fe604ea926a97f17fc8b367f2530c47b3e2d899a6148a2b0836b99da24442a5b8015f26e0cbc52088d24ca11b77c
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
deleted file mode 100644
index 3b0ad4792a54..000000000000
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg-7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur mpeg_encode.orig/jpeg.c mpeg_encode/jpeg.c
---- mpeg_encode.orig/jpeg.c	2009-08-24 21:33:18.000000000 +0300
-+++ mpeg_encode/jpeg.c	2009-08-24 22:23:08.000000000 +0300
-@@ -80,13 +80,9 @@
- /* make it happier.... */
- #undef DCTSIZE2
- #include "jpeglib.h"
--#include "jpegint.h"
--
- 
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
- 
--
--
- /*=======================================================================*
-  *                                                                       *
-  * JMovie2JPEG                                                           *
-@@ -517,7 +513,7 @@
- #ifdef JPEG4
-   buffer_height = 8;  /* could be 2, 4,8 rows high */
- #else
--  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
-+  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
- #endif
-   
-   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
diff --git a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch b/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch
deleted file mode 100644
index 7be3905577c3..000000000000
--- a/media-video/mpeg-tools/files/mpeg-tools-1.5b-system-jpeg.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Use the system jpeg rather than the bundled one
-
---- mpeg_encode/Makefile
-+++ mpeg_encode/Makefile
-@@ -36,9 +36,9 @@
- ##############
- # JPEG STUFF #
- ##############
--JPEG_LIB = jpeg/libjpeg.a
--JPEG_DIR = -Ijpeg
--JPEG_LIB_DIR = -Ljpeg
-+JPEG_LIB = -ljpeg
-+JPEG_DIR = 
-+JPEG_LIB_DIR = 
- MP_JPEG_OBJS = jpeg.o
- MP_JPEG_SRCS = jpeg.c
- 
-@@ -57,7 +57,7 @@
- #################
- # INCLUDE FILES # 
- #################
--INCLUDEDIR = -Iheaders -I/usr/include $(JPEG_DIR)
-+INCLUDEDIR = -Iheaders
- 
- ############################################################################
- # LIBRARIES # specify library directories; need jpg lib and maybe pbm	   #
---- mpeg_encode/jpeg.c
-+++ mpeg_encode/jpeg.c
-@@ -79,7 +79,8 @@
- 
- /* make it happier.... */
- #undef DCTSIZE2
--#include "jpeg/jpeglib.h"
-+#include "jpeglib.h"
-+#include "jpegint.h"
- 
- 
- #define HEADER_SIZE 607   /*JFIF header size used on output images*/
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
deleted file mode 100644
index 70ceb15423d2..000000000000
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-
-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}
-
-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}-system-jpeg.patch
-	epatch "${FILESDIR}"/${P}-system-jpeg-7.patch
-	epatch "${FILESDIR}"/${P}-tempfile-mpeg-encode.patch
-	epatch "${FILESDIR}"/${P}-tempfile-tests.patch
-	# 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
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	emake -C convert CC="$(tc-getCC)"
-	emake -C convert/mtv CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin mpeg_encode
-	doman docs/*.1
-	dodoc BUGS CHANGES README TODO VERSION
-	dodoc docs/EXTENSIONS docs/INPUT.FORMAT docs/*.param docs/param-summary
-	docinto examples
-	dodoc examples/*
-
-	cd ../convert
-	dobin eyuvtojpeg jmovie2jpeg mpeg_demux mtv/movieToVid
-	newdoc README README.convert
-	newdoc mtv/README README.mtv
-}
-
-pkg_postinst() {
-	if [[ -z $(best_version media-libs/netpbm) ]]; then
-		elog "If you are looking for eyuvtoppm or ppmtoeyuv, please"
-		elog "emerge the netpbm package.  It has updated versions."
-	fi
-}