gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 68 deletions

diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index ebbf041652d4..0d812e67a8b4 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -3,6 +3,5 @@ AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbf
 AUX libmpeg2-0.5.1-armv4l.patch 566 BLAKE2B 3c3c87dac145bb4f447cc0657da3eb703c61c8be2cc84623808b6ec48f9a4a3d334cfa92b53c4fccc7fa09fb0960518a350c8ca354af0cdd450f4aac1e0ad22b SHA512 3705438a1aed3a5f30cb04f4a5b6c128b22b9e4d6af949c6ad1244ec26e2302807c99e81866d08349ee2056ec66ce820747d265bd41cd0e300cd5ef667dfd53a
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
-EBUILD libmpeg2-0.5.1-r2.ebuild 1479 BLAKE2B 71e2d52780f78bf9718f0f9b4912bd90b8f8a69073abb6f09acfb221653f24e17e2033a64127fa28a8b25150535cec04964e0daa37abad2c85d60cc02c1ff0f9 SHA512 6f4b0fd8d2554e94820016584308247c32a17d311feacf5527b708af22876bf47ae6e336cc84ac4211528300b1d93abfa5fc76f77fa9a0641199901d9769792b
-EBUILD libmpeg2-0.5.1-r3.ebuild 1320 BLAKE2B 3936f3938d686c569f52c05414f38a44cfe0d1d92744fe1f15f69d1b18570327c775469fbb79ea7b4147517f206980dabe116aaac1c99e2b6a6a5a0419e099b9 SHA512 0e24bf88a4d4a5eb40042e52d73f01a70193a1d192569ce9ed83f0058c7556f3189960ecdfedde127254f1d96caabc76d941df59747857f600455651f00cbb35
+EBUILD libmpeg2-0.5.1-r3.ebuild 1313 BLAKE2B a4e289a342f06985e89c36790535f9098c8dc36a5a2088bffba3028d8727266f8117c4e10e404ef3b142f83f04f10d30c512734fdae080363b31320a147cf755 SHA512 6e3df51013b0a5b9acd15d03e432d4dd1943225b242f97e877db6397ff18728f6dde84695c11c4edadaea6a648e662c8abe11bde1db55cdd716cfec2144500e4
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
deleted file mode 100644
index a19f50792e15..000000000000
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils libtool ltprune multilib-minimal
-
-DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-HOMEPAGE="http://libmpeg2.sourceforge.net/"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="sdl static-libs X"
-
-RDEPEND="sdl? ( media-libs/libsdl )
-	X? (
-		x11-libs/libXv
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-arm-private-symbols.patch \
-		"${FILESDIR}"/${P}-global-symbol-test.patch \
-		"${FILESDIR}"/${P}-armv4l.patch
-	elibtoolize
-	### PowerPC fix for altivec
-	epatch "${FILESDIR}"/${P}-altivec.patch
-	eautoconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}"	\
-	econf \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		$(multilib_native_use_enable sdl) \
-		$(multilib_native_use_with X x)
-
-	# remove useless subdirs
-	if ! multilib_is_native_abi ; then
-		sed -i \
-			-e 's/ libvo src//' \
-			Makefile || die
-	fi
-}
-
-multilib_src_compile() {
-	emake OPT_CFLAGS="${CFLAGS}" \
-		MPEG2DEC_CFLAGS="${CFLAGS}" \
-		LIBMPEG2_CFLAGS=""
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-}
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
index 19f464944a6b..869573184e56 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="sdl X"
 
 RDEPEND="