From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 media-sound/gsm/gsm-1.0.13-r1.ebuild | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'media-sound/gsm/gsm-1.0.13-r1.ebuild')

diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 60550df0a103..47621630dd40 100644
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
 
 DESCRIPTION="Lossy speech compression library and tool"
 HOMEPAGE="https://packages.qa.debian.org/libg/libgsm.html"
@@ -11,24 +12,31 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="gsm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-pl' )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+	"${FILESDIR}"/${PN}-1.0.12-memcpy.patch
+	"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+)
 
 DOCS=( ChangeLog MACHINES MANIFEST README )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-shared.patch \
-		"${FILESDIR}"/${PN}-1.0.12-memcpy.patch \
-		"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+	default
+	sed -e 's/\$(GSM_INSTALL_LIB)\/libgsm.a	//g' -i Makefile || die
+
 	multilib_copy_sources
 }
 
-multilib_src_compile() {
+src_configure() {
 	# From upstream Makefile. Define this if your host multiplies
 	# floats faster than integers, e.g. on a SPARCstation.
 	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+}
 
+multilib_src_compile() {
 	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
 		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
@@ -44,7 +52,7 @@ multilib_src_install() {
 		TOAST_INSTALL_MAN="${ED}"/usr/share/man/man1 \
 		install
 
-	dolib lib/libgsm.so*
+	dolib.so lib/libgsm.so*
 
 	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
 }
-- 
cgit v1.2.3