[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/

[Michał Górny]

commit:     fc7737dd95521a78d1e0612ea177ff0b12ad502b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 19:35:02 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <mgorny <AT> 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