gentoo resync : 18.11.2019

3 files changed, 2 insertions, 62 deletions

diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index bcc9088e75d9..23eaeb4e5acf 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,6 +1,5 @@
 AUX libmpeg3-1.8-impldecl.patch 559 BLAKE2B a21953fc4acd57169fbb1e6bd48aaf8d6b3d0e3deaa635cbf6f8fe1dcd73bb394820f2f66b188c7d78ae2cc07d7cbbb0176327455a3a49e44ada8c48b8a072c8 SHA512 43affdcfd54146c0623478f6b2108b28b2be09c956d800705b24dfe9eff6c50e861c83e392371a4deaff19649d61fe27edc7521c7daa703ac369c96b5f698ff9
 DIST libmpeg3-1.7-gentoo.tar.bz2 5625 BLAKE2B 8c0e18c690d70d6dc2e87428993eda57c5b67152514221b38860644c21ab4a98d6f4060f9399be5bcfddaa42de0ce6f55019a6d88ae3abfc2793b9d57a0d85e5 SHA512 9ef94c41ee943e321c9fc14a02659a839f08554aac4f5c5abcb9835e9940f0e5dc4c67c26f8124de960cba78493fa43f6c800748c0426e6dc141aa106e2aabc1
 DIST libmpeg3-1.8-src.tar.bz2 2452350 BLAKE2B f5d4a3f7291847baa35bf5103f7bc5d79122d488c1f89ae6006912666cd29d4651cc74721e5e451f543c2493f64bd3cae0fa72384d866454cae6f3e0a2e77985 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
-EBUILD libmpeg3-1.8-r1.ebuild 1727 BLAKE2B 3723ad55bdf76f2b56ee158d902dd15d7bd14f660ff196ef6f45226bcd7785c518c700cf1d998f325f487912f4b317a2fa9c0337927b591a8701000b6f616617 SHA512 00e29078c853cf437cb63bd47553ebe9a9ab54a1dd381896eb36eb3bb763de46b7ab6fc6b55db8b0deefce89924fd3cace6fb6f2f49f926f09744c06f9a2db08
-EBUILD libmpeg3-1.8.ebuild 1624 BLAKE2B a88f0dd62bba769d2b4eaeb78a7f3aeb36a1cf8d232946544e799016938e306bd98423ae7f56de89e0dfc01fdd71b2de71a9da96ae1bb5ae954fc0863c210b40 SHA512 ae0deff29937211d86f2890c323abf90d5378f8385f72c692020c8b60134952305675fc4d131d54c47ef24b0f586e486c65cbb02fc80231e16b06cd56c3cf2cb
+EBUILD libmpeg3-1.8-r1.ebuild 1726 BLAKE2B ac04398102d640941c3d9681470ba7b5c1b215cf6f079330e0f201d9abac791d0413cbb132a23da88d6ee7a30fe5cf11e0b97b8924e7d1a3ee4fe44e8af4a194 SHA512 9aacb08e5e0944f90d9e476b724a5a022a254ea12b56b99476ce619dcaead6fc5564d6fc3016176b5329f06b7902567300745fea0ed7bc56fc237e0b43433f8f
 MISC metadata.xml 309 BLAKE2B 0ff62755ba6e4b13232af28e76b191520e01ff5603517e3e50b06a3cba120b6a3dccc3aabc3c726568b13c8ee46d21d7065afd6eef3547a3a4403cea155b1e20 SHA512 f14445391f7eee4a7f0906b3c483ccb915cd64bcccdbad63780bb1da5e0eb851621abebafc70f8b88cbfabd335fb396aa3dc909f5789cd8c8eb582af923a2d63
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
index 98b3de4522ac..ba65da7e8d11 100644
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="cpu_flags_x86_mmx"
 
 RDEPEND="sys-libs/zlib
diff --git a/media-libs/libmpeg3/libmpeg3-1.8.ebuild b/media-libs/libmpeg3/libmpeg3-1.8.ebuild
deleted file mode 100644
index a4a6d7b74205..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools toolchain-funcs
-
-DESCRIPTION="An mpeg library for linux"
-HOMEPAGE="http://heroinewarrior.com/libmpeg3.php"
-SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-1.7-gentoo.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="cpu_flags_x86_mmx"
-
-RDEPEND="sys-libs/zlib
-	virtual/jpeg
-	media-libs/a52dec"
-DEPEND="${RDEPEND}
-	cpu_flags_x86_mmx? ( dev-lang/nasm )"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}-1.7-mpeg3split.patch
-	epatch "${WORKDIR}"/${PN}-1.7-textrel.patch
-	epatch "${WORKDIR}"/${PN}-1.7-gnustack.patch
-	epatch "${WORKDIR}"/${PN}-1.7-a52.patch
-	epatch "${WORKDIR}"/${PN}-1.7-all_gcc4.patch
-	epatch "${WORKDIR}"/${PN}-1.7-all_pthread.patch
-
-	cp -rf "${WORKDIR}"/1.7/* .
-	eautoreconf
-}
-
-src_configure() {
-	#disabling css since it's a fake one.
-	#One can find in the sources this message :
-	#  Stubs for deCSS which can't be distributed in source form
-
-	econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		--disable-css
-}
-
-src_install() {
-	default
-	dohtml -r docs
-	# This is a workaround, it wants to rebuild
-	# everything if the headers	 have changed
-	# So we patch them after install...
-	cd "${ED}/usr/include/libmpeg3"
-	# This patch patches the .h files that get installed into /usr/include
-	# to show the correct include syntax '<>' instead of '""'  This patch
-	# was also generated using info from SF's src.rpm
-	epatch "${WORKDIR}"/gentoo-p2.patch
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}