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 467DA138331 for ; Wed, 3 Jan 2018 18:39:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48E28E0849; Wed, 3 Jan 2018 18:39:11 +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 281B4E0841 for ; Wed, 3 Jan 2018 18:39:11 +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 514D5335C45 for ; Wed, 3 Jan 2018 18:39:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 155981A3 for ; Wed, 3 Jan 2018 18:39:09 +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: <1515004641.ee89960c8665621a824df0b1ca142d67d662d2e3.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/suacomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/suacomp/suacomp-9999.ebuild X-VCS-Directories: sys-libs/suacomp/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ee89960c8665621a824df0b1ca142d67d662d2e3 X-VCS-Branch: master Date: Wed, 3 Jan 2018 18:39:09 +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-Archives-Salt: 036b0ba9-0df8-46cf-85d5-224182bb45ad X-Archives-Hash: deda30b8d3e4ef31ad9efe7e86a7e0ce commit: ee89960c8665621a824df0b1ca142d67d662d2e3 Author: David Seifert gentoo org> AuthorDate: Wed Jan 3 18:37:21 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Jan 3 18:37:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee89960c sys-libs/suacomp: Port to git-r3 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-libs/suacomp/suacomp-9999.ebuild | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys-libs/suacomp/suacomp-9999.ebuild b/sys-libs/suacomp/suacomp-9999.ebuild index c40821304da..b356312ab40 100644 --- a/sys-libs/suacomp/suacomp-9999.ebuild +++ b/sys-libs/suacomp/suacomp-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit toolchain-funcs flag-o-matic git-2 +inherit flag-o-matic toolchain-funcs git-r3 DESCRIPTION="library wrapping the interix lib-c to make it less buggy" HOMEPAGE="http://suacomp.sf.net" @@ -11,7 +11,6 @@ EGIT_REPO_URI="https://git.code.sf.net/p/suacomp/git" LICENSE="BEER-WARE" SLOT="0" -KEYWORDS="" IUSE="debug" DEPEND="" @@ -21,9 +20,11 @@ get_opts() { local shlibc= local stlibc= + local dir for dir in /usr/lib /usr/lib/x86; do [[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a + local name for name in libc.so.5.2 libc.so.3.5; do [[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; } done @@ -34,7 +35,7 @@ get_opts() { echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}" } -pkg_setup() { +src_configure() { if use debug; then append-flags -D_DEBUG -D_DEBUG_TRACE fi @@ -44,11 +45,6 @@ src_compile() { emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" } -src_install() { - emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ - CFLAGS="${CFLAGS}" -} - src_test() { local v= @@ -57,3 +53,8 @@ src_test() { emake check $(get_opts) ${v} } + +src_install() { + emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ + CFLAGS="${CFLAGS}" +}