sys-firmware/sigrok-firmware-fx2lafw: Make binary USE flag apply to non-live ebuilds...

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener <swegener@gentoo.org>

diff --git a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
index 156ad5b0f6222d8508a86386b25253f1d9b391cd..e2847a43887bbe144084b6e881082e9789edfb5e 100644 (file)
--- a/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
+++ b/sys-firmware/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-9999.ebuild
@@ -4,13 +4,18 @@
 
 EAPI="6"
 
+SDCC_DEPEND=">=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)]"
+
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="git://sigrok.org/${PN}"
+       IUSE=""
        inherit git-r3 autotools
 else
        SRC_URI="binary? ( http://sigrok.org/download/binary/${PN}/${PN}-bin-${PV}.tar.gz )
                !binary? ( http://sigrok.org/download/source/${PN}/${P}.tar.gz )"
        KEYWORDS="~amd64 ~x86"
+       IUSE="binary"
+       SDCC_DEPEND="!binary? ( ${SDCC_DEPEND} )"
 fi
 
 DESCRIPTION="open-source firmware for Cypress FX2 chips which makes them usable as simple logic analyzer hardware"
@@ -18,16 +23,19 @@ HOMEPAGE="http://sigrok.org/wiki/Fx2lafw"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="binary"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-       !binary? ( >=dev-embedded/sdcc-2.9.0[device-lib(+),mcs51(+)] )"
+       ${SDCC_DEPEND}"
 
 src_unpack() {
-       [[ ${PV} == "9999" ]] && git-r3_src_unpack || default
-       # The binary & source dirs are slightly diff.
-       use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+       if [[ ${PV} == "9999" ]]; then
+               git-r3_src_unpack
+       else
+               default
+               # The binary & source dirs are slightly diff.
+               use binary && S="${WORKDIR}/${PN}-bin-${PV}"
+       fi
 }
 
 src_prepare() {
@@ -36,7 +44,7 @@ src_prepare() {
 }
 
 src_install() {
-       if use binary ; then
+       if [[ ${PV} != "9999" ]] && use binary ; then
                insinto /usr/share/sigrok-firmware
                doins *.fw
                dodoc ChangeLog NEWS README