From 19f69a5d4d8245c2c5d112403a86df54fd28001e Mon Sep 17 00:00:00 2001
From: Huang Rui <vowstar@gmail.com>
Date: Sun, 12 Jan 2020 19:35:03 +0800
Subject: [PATCH] Fix EAPI=7 is not supported problem

Signed-off-by: Huang Rui <vowstar@gmail.com>
---
 dev-util/fernflower/fernflower-1.ebuild            |  2 +-
 media-libs/libspiro/libspiro-0.3.20150131.ebuild   |  2 +-
 .../libuninameslist-20140731.ebuild                | 30 +++++++++++++++++++---
 media-sound/deadbeef/deadbeef-0.5.1-r3.ebuild      |  2 +-
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/dev-util/fernflower/fernflower-1.ebuild b/dev-util/fernflower/fernflower-1.ebuild
index 5c9ef121b..873b8cf70 100644
--- a/dev-util/fernflower/fernflower-1.ebuild
+++ b/dev-util/fernflower/fernflower-1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=6
 
 inherit eutils versionator
 
diff --git a/media-libs/libspiro/libspiro-0.3.20150131.ebuild b/media-libs/libspiro/libspiro-0.3.20150131.ebuild
index ad739ee49..0690b0089 100644
--- a/media-libs/libspiro/libspiro-0.3.20150131.ebuild
+++ b/media-libs/libspiro/libspiro-0.3.20150131.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=7
 
-inherit autotools-multilib
+inherit autotools
 
 DESCRIPTION="Spiro is the creation of Raph Levien. It simplifies the drawing of beautiful curves."
 HOMEPAGE="https://github.com/fontforge/libspiro"
diff --git a/media-libs/libuninameslist/libuninameslist-20140731.ebuild b/media-libs/libuninameslist/libuninameslist-20140731.ebuild
index 0bd457918..0b4d49a0f 100644
--- a/media-libs/libuninameslist/libuninameslist-20140731.ebuild
+++ b/media-libs/libuninameslist/libuninameslist-20140731.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fontforge/${PN}/archive/0.4.${PV}.tar.gz -> ${PN}-0.
 
 S="${WORKDIR}/${PN}-0.4.${PV}"
 
-inherit autotools-multilib
+inherit autotools
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -21,9 +21,33 @@ src_prepare(){
 	eautoreconf
 }
 
-multilib_src_configure(){
+src_configure(){
 	local myeconfargs=(
 		$(use_enable static-libs static)
 	)
-	autotools-utils_src_configure
+# Common args
+	local econfargs=()
+
+	_check_build_dir
+	if "${ECONF_SOURCE}"/configure --help 2>&1 | grep -q '^ *--docdir='; then
+		econfargs+=(
+			--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		)
+	fi
+
+	# Handle static-libs found in IUSE, disable them by default
+	if in_iuse static-libs; then
+		econfargs+=(
+			--enable-shared
+			$(use_enable static-libs static)
+		)
+	fi
+
+	# Append user args
+	econfargs+=("${myeconfargs[@]}")
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	econf "${econfargs[@]}" "$@"
+	popd > /dev/null || die
 }
diff --git a/media-sound/deadbeef/deadbeef-0.5.1-r3.ebuild b/media-sound/deadbeef/deadbeef-0.5.1-r3.ebuild
index a0b691ebd..f49bac0d5 100644
--- a/media-sound/deadbeef/deadbeef-0.5.1-r3.ebuild
+++ b/media-sound/deadbeef/deadbeef-0.5.1-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=7
+EAPI=6
 
 inherit fdo-mime gnome2 eutils
 
-- 
2.11.4.GIT