[gentoo-commits] repo/gentoo:master commit in: media-sound/gsm/

[David Seifert]

commit:     e2f76130d252cbbefd0173a4d5154b711f2401b5
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Oct  6 23:29:47 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 12:34:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f76130

media-sound/gsm: do not install static libraries

Closes: https://github.com/gentoo/gentoo/pull/13069
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

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

diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild 
b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 60550df0a10..13399780272 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,33 @@ 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-minimal_src_compile
+}
+
+multilib_src_compile() {
        emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
                LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
@@ -44,7 +54,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
 }