From 59389557ee75b546b9f536f8a1ff3ebda8cfb507 Mon Sep 17 00:00:00 2001
From: David Michael <fedora.dm0@gmail.com>
Date: Sun, 3 Jan 2021 21:18:16 -0500
Subject: [PATCH] media-libs/libbdplus: EAPI 7

Closes: https://bugs.gentoo.org/567196
Closes: https://bugs.gentoo.org/763477
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0@gmail.com>
---
 media-libs/libbdplus/libbdplus-0.1.2.ebuild | 25 +++++++++++++------
 media-libs/libbdplus/libbdplus-9999.ebuild  | 27 +++++++++++++++------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/media-libs/libbdplus/libbdplus-0.1.2.ebuild b/media-libs/libbdplus/libbdplus-0.1.2.ebuild
index c1491101143..6dc0e0b8ea6 100644
--- a/media-libs/libbdplus/libbdplus-0.1.2.ebuild
+++ b/media-libs/libbdplus/libbdplus-0.1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib
+EAPI=7
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
@@ -24,12 +24,23 @@ RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
-DOCS="ChangeLog README.txt"
+DOCS=( ChangeLog README.txt )
 
-src_configure() {
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
 	local myeconfargs=(
 		--disable-optimizations
+		$(use_enable static-libs static)
 		$(use_with aacs libaacs)
 	)
-	autotools-multilib_src_configure
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libbdplus/libbdplus-9999.ebuild b/media-libs/libbdplus/libbdplus-9999.ebuild
index 5525e10aec4..c6f6db23182 100644
--- a/media-libs/libbdplus/libbdplus-9999.ebuild
+++ b/media-libs/libbdplus/libbdplus-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib
+EAPI=7
+inherit multilib-minimal
 
 if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbdplus.git"
 else
 	SRC_URI="https://downloads.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Blu-ray library for BD+ decryption"
@@ -24,12 +24,23 @@ RDEPEND="dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.7.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
-DOCS="ChangeLog README.txt"
+DOCS=( ChangeLog README.md )
 
-src_configure() {
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
 	local myeconfargs=(
 		--disable-optimizations
+		$(use_enable static-libs static)
 		$(use_with aacs libaacs)
 	)
-	autotools-multilib_src_configure
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
 }
-- 
2.26.2