From 7a25a39dbcc10bf3b4a5c8d2292d431d06cacd50 Mon Sep 17 00:00:00 2001
From: David Michael <fedora.dm0@gmail.com>
Date: Fri, 15 Jan 2021 14:44:55 -0500
Subject: [PATCH] media-libs/libmpeg2: EAPI 7, drop static-libs

Closes: https://bugs.gentoo.org/765565
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0@gmail.com>
---
 .../files/libmpeg2-0.5.1-altivec.patch        |  4 +-
 .../files/libmpeg2-0.5.1-armv4l.patch         |  5 +--
 media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild  | 42 ++++++++-----------
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
index 617fe750995..1c269695b8b 100644
--- a/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
+++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
@@ -1,5 +1,5 @@
---- configure.ac.bak	2010-05-25 17:12:14.756245990 +0000
-+++ configure.ac	2010-05-25 17:11:51.629581723 +0000
+--- a/configure.ac	2010-05-25 17:12:14.756245990 +0000
++++ b/configure.ac	2010-05-25 17:11:51.629581723 +0000
 @@ -79,11 +79,10 @@
  		 CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
  		 AC_MSG_CHECKING([if <altivec.h> is needed])
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
index bd9561e0c46..be81db45653 100644
--- a/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
+++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
@@ -1,6 +1,5 @@
-diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S
---- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
-+++ libmpeg2/libmpeg2/motion_comp_arm_s.S	2009-11-20 19:55:22.000000000 +0100
+--- a/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
++++ b/libmpeg2/motion_comp_arm_s.S	2009-11-20 19:55:22.000000000 +0100
 @@ -19,6 +19,16 @@
  @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index a19f50792e1..7f853861dec 100644
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils libtool ltprune multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
 HOMEPAGE="http://libmpeg2.sourceforge.net/"
@@ -12,7 +12,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"
-IUSE="sdl static-libs X"
+IUSE="sdl X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
 	X? (
@@ -26,40 +26,34 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-altivec.patch
+	"${FILESDIR}"/${P}-arm-private-symbols.patch
+	"${FILESDIR}"/${P}-armv4l.patch
+	"${FILESDIR}"/${P}-global-symbol-test.patch
+)
+
 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
+	default
+	eautoreconf
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}"	\
-	econf \
-		$(use_enable static-libs static) \
+	ECONF_SOURCE="${S}" econf \
+		--disable-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_is_native_abi || sed -i -e 's/ libvo src//' Makefile || die
 }
 
 multilib_src_compile() {
-	emake OPT_CFLAGS="${CFLAGS}" \
-		MPEG2DEC_CFLAGS="${CFLAGS}" \
-		LIBMPEG2_CFLAGS=""
+	emake {MPEG2DEC,OPT}_CFLAGS="${CFLAGS}" LIBMPEG2_CFLAGS=
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
 	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
 }
-- 
2.26.2