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 4B6B3138359 for ; Tue, 21 Jul 2020 08:32:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20EFAE08FC; Tue, 21 Jul 2020 08:32:34 +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 090BDE08FC for ; Tue, 21 Jul 2020 08:32:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CCEF934F33D for ; Tue, 21 Jul 2020 08:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 803EE2E5 for ; Tue, 21 Jul 2020 08:32:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1595320342.bdd9d770642b91e59b71b6e018db6888a0beba84.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libseccomp/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libseccomp/libseccomp-9999.ebuild X-VCS-Directories: sys-libs/libseccomp/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: bdd9d770642b91e59b71b6e018db6888a0beba84 X-VCS-Branch: master Date: Tue, 21 Jul 2020 08:32:29 +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: 8a597587-f6ab-4c26-b245-5c172024183e X-Archives-Hash: 08ad6d9b8b919b67463056aef3c2b25b commit: bdd9d770642b91e59b71b6e018db6888a0beba84 Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 21 08:25:10 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jul 21 08:32:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd9d770 sys-libs/libseccomp: Minor improvements for the live ebuild Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> sys-libs/libseccomp/libseccomp-9999.ebuild | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys-libs/libseccomp/libseccomp-9999.ebuild b/sys-libs/libseccomp/libseccomp-9999.ebuild index 5604393c136..a70a1f90aa9 100644 --- a/sys-libs/libseccomp/libseccomp-9999.ebuild +++ b/sys-libs/libseccomp/libseccomp-9999.ebuild @@ -3,15 +3,6 @@ EAPI=7 -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" - PRERELEASE="2.5.0" - inherit autotools git-r3 -else - SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" -fi - PYTHON_COMPAT=( python3_{6..9} ) DISTUTILS_OPTIONAL=1 @@ -20,6 +11,15 @@ inherit distutils-r1 multilib-minimal DESCRIPTION="high level interface to Linux seccomp filter" HOMEPAGE="https://github.com/seccomp/libseccomp" +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/seccomp/libseccomp.git" + PRERELEASE="2.6.0" + inherit autotools git-r3 +else + SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar.gz" + KEYWORDS="-* ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux" +fi + LICENSE="LGPL-2.1" SLOT="0" IUSE="python static-libs" @@ -55,7 +55,9 @@ multilib_src_compile() { if multilib_is_native_abi && use python ; then cd "${S}/src/python" || die - sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" -e "/extra_objects/s,\.\.,${OLDPWD}/src," setup.py + sed -i -e "s/=.*VERSION_RELEASE.*,/=\"${PRERELEASE}\",/" \ + -e "/extra_objects/s,\.\.,${OLDPWD}/src," \ + setup.py || die local -x CPPFLAGS="-I${OLDPWD}/include -I../../include" distutils-r1_src_compile fi