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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D869158011 for ; Sun, 4 Sep 2022 19:37:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC748E08D3; Sun, 4 Sep 2022 19:36:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1038E08D3 for ; Sun, 4 Sep 2022 19:36:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABD8C3406BF for ; Sun, 4 Sep 2022 19:36:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D69C25B5 for ; Sun, 4 Sep 2022 19:36:21 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1662320128.fc7737dd95521a78d1e0612ea177ff0b12ad502b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild X-VCS-Directories: dev-python/pypy3-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fc7737dd95521a78d1e0612ea177ff0b12ad502b X-VCS-Branch: master Date: Sun, 4 Sep 2022 19:36:21 +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: 8d57ee5a-4858-4c68-ad59-03b8ff52a78f X-Archives-Hash: 55c02ccd21427859b08e41a93e18bfa2 commit: fc7737dd95521a78d1e0612ea177ff0b12ad502b Author: Michał Górny gentoo org> AuthorDate: Sun Sep 4 19:35:02 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Sep 4 19:35:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7737dd dev-python/pypy3-exe: Remove USE=bzip2 Remove USE=bzip2 and build bzip2 support unconditionally. Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild index 5da06e316e7b..72dfa58bd8fd 100644 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.9_p3.ebuild @@ -22,14 +22,14 @@ S="${WORKDIR}/${MY_P}-src" LICENSE="MIT" SLOT="3.9-${PYPY_PV}" KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2" +IUSE="+jit low-memory ncurses cpu_flags_x86_sse2" RDEPEND=" - >=sys-libs/zlib-1.1.3:0= + app-arch/bzip2:0= + dev-libs/expat:0= dev-libs/libffi:0= + >=sys-libs/zlib-1.1.3:0= virtual/libintl:0= - dev-libs/expat:0= - bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:${SLOT} " @@ -120,24 +120,10 @@ src_configure() { ${jit_backend} pypy/goal/targetpypystandalone + --withmod-bz2 + $(usex ncurses --with{,out}mod-_minimal_curses) ) - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - local interp=( "${EPYTHON}" ) if use low-memory; then interp=( env PYPY_GC_MAX_DELTA=200MB