gentoo resync : 16.01.2021

4 files changed, 68 insertions, 87 deletions

diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 4cf0b6e93514..994843450f09 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -1,5 +1,4 @@
-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-patches-r0.tar.xz 5012 BLAKE2B b4a9a50f5765d233d48c50ef2156fa84a1e3804415847eabb33c9987597fba964983f89f973ba4f5458d5a0e77882b878b7b33a7c22adb1d3ad0824698126bad SHA512 233136e214403dc37bf5a6e66e017a051455f6745c57e204c1d0cd4ffcb8e0df858f945520e183886cf4df1930a2a566b08f69e9292642ec1eacffa0946c830b
 DIST libmpeg3-1.8-src.tar.bz2 2452350 BLAKE2B f5d4a3f7291847baa35bf5103f7bc5d79122d488c1f89ae6006912666cd29d4651cc74721e5e451f543c2493f64bd3cae0fa72384d866454cae6f3e0a2e77985 SHA512 e381f07d46d47d391c6db420791a065e3572e17ca63966eb52712560867866683505693f73b25869059319eec66fd1c2f923dbef1fdca5ef9efbe598e217d60e
-EBUILD libmpeg3-1.8-r1.ebuild 1707 BLAKE2B 2b856e8559d6d4815a091c6ba0aabb0be9547f9f8df3d05d2fceba3363cd4a034090553b90728b75a7d7350e7fc336b6594626d9c5e5bf527e3c1e0dbf694fd7 SHA512 a996728e04529e00e90e9d94e992ab1d078d30275fb3059c73f00afa5294ccb4b4dd317b0595d022c04a20f5ad8cb8dbd363e7bd25ebdcb5cb800e48e9b9f0b1
+EBUILD libmpeg3-1.8-r2.ebuild 1810 BLAKE2B c33aed2331c5ca419438855e57b81acdcd120ead6e785bf8c2e9fdbe86ff779a896b1688561ad62d23525626f3d400a640e18a50d764e7fb32ece1cf8305751a SHA512 d574ddf439275e2ba76f7ded5be1ed2482e9b97d0ebfe6fb013b79bec0de3caeb63535b34fdf7590ffe09b25d91ab0d6c91fa70bbe8569452e6142bac7b42172
 MISC metadata.xml 310 BLAKE2B 7587cb72a91920b8ccaa188ac9adc08790997f2725c59e89c1a4f9ed5e07da4dd52b04e755655164a97eac3fe1d9c4c0aa89bea143c45843880916fb0b0dcae0 SHA512 acea51c1ce1d726d09c8b39557afe59844f17da2b78531d24faa7b1294b81fdb8c3cb6731548e5407ad0720023d176bf18d70edbacf6def86c01f26a7409c4d7
diff --git a/media-libs/libmpeg3/files/libmpeg3-1.8-impldecl.patch b/media-libs/libmpeg3/files/libmpeg3-1.8-impldecl.patch
deleted file mode 100644
index 632537b87191..000000000000
--- a/media-libs/libmpeg3/files/libmpeg3-1.8-impldecl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: libmpeg3-1.8/audio/ac3.c
-===================================================================
---- libmpeg3-1.8.orig/audio/ac3.c
-+++ libmpeg3-1.8/audio/ac3.c
-@@ -6,6 +6,7 @@
- #include "mpeg3protos.h"
- 
- #include <string.h>
-+#include <stdlib.h>
- 
- 
- mpeg3_ac3_t* mpeg3_new_ac3()
-Index: libmpeg3-1.8/audio/layer3.c
-===================================================================
---- libmpeg3-1.8.orig/audio/layer3.c
-+++ libmpeg3-1.8/audio/layer3.c
-@@ -5,6 +5,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- struct gr_info_s 
- {
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
deleted file mode 100644
index 2b72b966641f..000000000000
--- a/media-libs/libmpeg3/libmpeg3-1.8-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch multilib-minimal
-
-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 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="cpu_flags_x86_mmx"
-
-RDEPEND="sys-libs/zlib
-	virtual/jpeg:0
-	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
-
-	epatch "${FILESDIR}/${P}-impldecl.patch"
-
-	cp -rf "${WORKDIR}"/1.7/* .
-	eautoreconf
-}
-
-multilib_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_SOURCE="${S}" econf \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		--disable-css
-}
-
-multilib_src_install_all() {
-	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 '{}' +
-}
diff --git a/media-libs/libmpeg3/libmpeg3-1.8-r2.ebuild b/media-libs/libmpeg3/libmpeg3-1.8-r2.ebuild
new file mode 100644
index 000000000000..c1a9ce4e0139
--- /dev/null
+++ b/media-libs/libmpeg3/libmpeg3-1.8-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="An mpeg library for linux"
+HOMEPAGE="http://heroinewarrior.com/libmpeg3.php"
+SRC_URI="
+	mirror://sourceforge/heroines/${P}-src.tar.bz2
+	https://dev.gentoo.org/~soap/distfiles/${P}-patches-r0.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+IUSE="cpu_flags_x86_mmx"
+
+RDEPEND="
+	media-libs/a52dec
+	sys-libs/zlib
+	virtual/jpeg:0"
+DEPEND="${RDEPEND}"
+BDEPEND="cpu_flags_x86_mmx? ( dev-lang/nasm )"
+
+PATCHES=(
+	"${WORKDIR}"/patches/${PN}-1.7-mpeg3split.patch
+	"${WORKDIR}"/patches/${PN}-1.7-textrel.patch
+	"${WORKDIR}"/patches/${PN}-1.7-gnustack.patch
+	"${WORKDIR}"/patches/${PN}-1.7-a52.patch
+	"${WORKDIR}"/patches/${PN}-1.7-all_gcc4.patch
+	"${WORKDIR}"/patches/${PN}-1.7-all_pthread.patch
+	"${WORKDIR}"/patches/${P}-impldecl.patch
+)
+
+src_prepare() {
+	default
+
+	cp -rf "${WORKDIR}"/patches/1.7/. . || die
+	eautoreconf
+}
+
+multilib_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_SOURCE="${S}" econf \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		--disable-css
+}
+
+multilib_src_install_all() {
+	HTML_DOCS=( docs/. )
+	einstalldocs
+
+	# 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 || die
+	# 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
+	eapply "${WORKDIR}"/patches/gentoo-p2.patch
+
+	find "${ED}" -name '*.la' -delete || die
+}