From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2652138334 for ; Sun, 20 Oct 2019 12:34:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A93B8E0857; Sun, 20 Oct 2019 12:34:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AA1EE0857 for ; Sun, 20 Oct 2019 12:34:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A30734C0A3 for ; Sun, 20 Oct 2019 12:34:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 158627FE for ; Sun, 20 Oct 2019 12:34:38 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1571574852.e2f76130d252cbbefd0173a4d5154b711f2401b5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/gsm/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/gsm/gsm-1.0.13-r1.ebuild X-VCS-Directories: media-sound/gsm/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: e2f76130d252cbbefd0173a4d5154b711f2401b5 X-VCS-Branch: master Date: Sun, 20 Oct 2019 12:34:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 56af2a3e-a7e5-4186-acda-63a0dafaa12b X-Archives-Hash: 287c9f2a56a87bb662d1efb8bbe603a0 commit: e2f76130d252cbbefd0173a4d5154b711f2401b5 Author: Alessandro Barbieri gmail com> AuthorDate: Sun Oct 6 23:29:47 2019 +0000 Commit: David Seifert gentoo 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 gmail.com> Signed-off-by: David Seifert 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 }