Skip to content

Commit a79b41e

Browse files
committed
proxmark3: update deps correctly.
1 parent dcab239 commit a79b41e

2 files changed

Lines changed: 57 additions & 16 deletions

File tree

net-wireless/proxmark3/proxmark3-4.21128-r1.ebuild renamed to net-wireless/proxmark3/proxmark3-4.21128-r2.ebuild

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Copyright 1999-2024 Gentoo Authors
1+
# Copyright 1999-2026 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=8
55

66
PYTHON_COMPAT=( python3_{11..14} )
7-
inherit flag-o-matic python-any-r1 toolchain-funcs udev
7+
inherit flag-o-matic python-single-r1 toolchain-funcs udev
88

99
if [ "${PV}" = "9999" ]; then
1010
inherit git-r3
@@ -28,6 +28,7 @@ SLOT="0"
2828
IUSE="+bluez +firmware opencl +qt"
2929

3030
CDEPEND="
31+
${PYTHON_DEPS}
3132
app-arch/bzip2
3233
app-arch/lz4:=
3334
dev-libs/jansson:=
@@ -36,21 +37,26 @@ CDEPEND="
3637
media-libs/gd:2=
3738
bluez? ( net-wireless/bluez:= )
3839
opencl? ( dev-libs/opencl-icd-loader )
39-
qt? ( dev-qt/qtcore:5
40-
dev-qt/qtwidgets:5
41-
dev-qt/qtgui:5 )
40+
qt? (
41+
dev-qt/qtcore:5
42+
dev-qt/qtgui:5
43+
dev-qt/qtwidgets:5
44+
)
4245
"
4346
DEPEND="${CDEPEND}
4447
dev-util/opencl-headers
4548
"
4649
RDEPEND="${CDEPEND}
4750
dev-lang/lua:5.4
48-
dev-python/ansicolors
49-
dev-python/sslcrypto
51+
$(python_gen_cond_dep '
52+
dev-python/ansicolors[${PYTHON_USEDEP}]
53+
dev-python/sslcrypto[${PYTHON_USEDEP}]
54+
')
5055
"
5156
#ncurses is basically just used for termcap
5257
PDEPEND="sys-libs/ncurses:*[tinfo]"
5358
BDEPEND="firmware? ( sys-devel/gcc-arm-none-eabi:0 )"
59+
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
5460

5561
QA_FLAGS_IGNORED="usr/share/proxmark3/firmware/bootrom.elf
5662
usr/share/proxmark3/firmware/fullimage.elf
@@ -180,9 +186,24 @@ src_compile(){
180186
#common flags
181187
EMAKE_COMMON=CC="$(tc-getCC)" DEFCFLAGS="${CFLAGS}" MYCFLAGS="${CFLAGS}"
182188
EMAKE_COMMON+= MYCXXFLAGS="${CXXFLAGS}" MYLDFLAGS="${LDFLAGS}"
183-
use bluez || export SKIPBT=1
184-
use qt || export SKIPQT=1
185-
use opencl || export SKIPOPENCL=1
189+
if use bluez; then
190+
export FORCEBT=1
191+
else
192+
export SKIPBT=1
193+
fi
194+
if use qt; then
195+
export FORCEQT6=1
196+
else
197+
export SKIPQT=1
198+
fi
199+
if use opencl; then
200+
export FORCEOPENCL=1
201+
else
202+
export SKIPOPENCL=1
203+
fi
204+
export FORCEGD=1
205+
export FORCEZPIB=1
206+
export FORCEREADLINE=1
186207
if use firmware; then
187208
#prevent repeat cleaning of things which were never built
188209
sed -i '/\$(Q)\$(MAKE) \-\-no-print-directory \-C recovery clean/d' Makefile || die

‎net-wireless/proxmark3/proxmark3-9999.ebuild‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
EAPI=8
55

66
PYTHON_COMPAT=( python3_{11..14} )
7-
inherit flag-o-matic python-any-r1 toolchain-funcs udev
7+
inherit flag-o-matic python-single-r1 toolchain-funcs udev
88

99
if [ "${PV}" = "9999" ]; then
1010
inherit git-r3
@@ -28,11 +28,13 @@ SLOT="0"
2828
IUSE="+bluez +firmware opencl +qt"
2929

3030
CDEPEND="
31+
${PYTHON_DEPS}
3132
app-arch/bzip2
3233
app-arch/lz4:=
3334
dev-libs/jansson:=
3435
dev-libs/openssl:=
3536
sys-libs/readline:=
37+
sys-libs/zlib
3638
media-libs/gd:2=
3739
bluez? ( net-wireless/bluez:= )
3840
opencl? ( dev-libs/opencl-icd-loader )
@@ -45,12 +47,15 @@ DEPEND="${CDEPEND}
4547
"
4648
RDEPEND="${CDEPEND}
4749
dev-lang/lua:5.4
48-
dev-python/ansicolors
49-
dev-python/sslcrypto
50+
$(python_gen_cond_dep '
51+
dev-python/ansicolors[${PYTHON_USEDEP}]
52+
dev-python/sslcrypto[${PYTHON_USEDEP}]
53+
')
5054
"
5155
#ncurses is basically just used for termcap
5256
PDEPEND="sys-libs/ncurses:*[tinfo]"
5357
BDEPEND="firmware? ( sys-devel/gcc-arm-none-eabi:0 )"
58+
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
5459

5560
QA_FLAGS_IGNORED="usr/share/proxmark3/firmware/bootrom.elf
5661
usr/share/proxmark3/firmware/fullimage.elf
@@ -179,9 +184,24 @@ src_compile(){
179184
append-cflags $(test-flags-CC -fPIC)
180185
EMAKE_COMMON=CC="$(tc-getCC)" DEFCFLAGS="${CFLAGS}" MYCFLAGS="${CFLAGS}"
181186
EMAKE_COMMON+= MYCXXFLAGS="${CXXFLAGS}" MYLDFLAGS="${LDFLAGS}"
182-
use bluez || export SKIPBT=1
183-
use qt || export SKIPQT=1
184-
use opencl || export SKIPOPENCL=1
187+
if use bluez; then
188+
export FORCEBT=1
189+
else
190+
export SKIPBT=1
191+
fi
192+
if use qt; then
193+
export FORCEQT6=1
194+
else
195+
export SKIPQT=1
196+
fi
197+
if use opencl; then
198+
export FORCEOPENCL=1
199+
else
200+
export SKIPOPENCL=1
201+
fi
202+
export FORCEGD=1
203+
export FORCEZPIB=1
204+
export FORCEREADLINE=1
185205
if use firmware; then
186206
#prevent repeat cleaning of things which were never built
187207
sed -i '/\$(Q)\$(MAKE) \-\-no-print-directory \-C recovery clean/d' Makefile || die

0 commit comments

Comments
 (0)