diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-11-09 17:24:59 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-11-09 17:24:59 +0000 |
| commit | bb27b41cd35159ec2c6adba499ba87f408548daa (patch) | |
| tree | 6d410a4f51902e07935a860f145b0168eeab9933 /media-tv | |
| parent | Version bump to fix Makefile for po files. (diff) | |
| download | gentoo-2-bb27b41cd35159ec2c6adba499ba87f408548daa.tar.gz gentoo-2-bb27b41cd35159ec2c6adba499ba87f408548daa.tar.bz2 gentoo-2-bb27b41cd35159ec2c6adba499ba87f408548daa.zip | |
Make ebuild also depend on unshield when no DVB_CARD is defined and all are installed.
(Portage version: 2.1.2_rc1-r5)
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/linuxtv-dvb-firmware/ChangeLog | 7 | ||||
| -rw-r--r-- | media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild | 21 |
2 files changed, 17 insertions, 11 deletions
diff --git a/media-tv/linuxtv-dvb-firmware/ChangeLog b/media-tv/linuxtv-dvb-firmware/ChangeLog index c905fca20c94..4fc510e6b6d9 100644 --- a/media-tv/linuxtv-dvb-firmware/ChangeLog +++ b/media-tv/linuxtv-dvb-firmware/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-tv/linuxtv-dvb-firmware # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.8 2006/11/08 19:33:50 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.9 2006/11/09 17:24:59 zzam Exp $ + + 09 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> + linuxtv-dvb-firmware-2006.11.08.ebuild: + Make ebuild also depend on unshield when no DVB_CARD is defined and all are + installed. *linuxtv-dvb-firmware-2006.11.08 (08 Nov 2006) diff --git a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild index fc1ab927a6a3..d9ff489014ea 100644 --- a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild +++ b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild,v 1.1 2006/11/08 19:33:50 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2006.11.08.ebuild,v 1.2 2006/11/09 17:24:59 zzam Exp $ DESCRIPTION="Firmware files needed for operation of some dvb-devices" HOMEPAGE="http://www.linuxtv.org" @@ -10,7 +10,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="dvb_cards_sp887x? ( >=app-arch/unshield-0.4 )" +UNSHIELD_DEPEND=">=app-arch/unshield-0.4" +DEPEND="dvb_cards_sp887x? ( ${UNSHIELD_DEPEND} )" RDEPEND="" @@ -153,8 +154,8 @@ FW_URLS=( SRC_URI="" NEGATIVE_USE_FLAGS="" +NEGATIVE_END_BRACKETS="" ALL_URLS="" -NUMBER_OF_USE_FLAGS=0 for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do URL="${FW_URLS[CARD]}" @@ -167,7 +168,7 @@ for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do IUSE="${IUSE} dvb_cards_${FW_USE_FLAGS[CARD]}" NEGATIVE_USE_FLAGS="${NEGATIVE_USE_FLAGS} !dvb_cards_${FW_USE_FLAGS[CARD]}? ( " - NUMBER_OF_USE_FLAGS=$((NUMBER_OF_USE_FLAGS+1)) + NEGATIVE_END_BRACKETS="${NEGATIVE_END_BRACKETS} )" ALL_URLS="${ALL_URLS} ${URL}" GET_PARAM="${FW_GET_PARAMETER[CARD]}" @@ -178,13 +179,13 @@ for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do done -SRC_URI="${SRC_URI} ${NEGATIVE_USE_FLAGS} ${ALL_URLS}" - -# add closing brackets for negative use flags -for ((NR=0; NR < ${NUMBER_OF_USE_FLAGS}; NR++)) do - SRC_URI="${SRC_URI} )" -done +SRC_URI="${SRC_URI} ${NEGATIVE_USE_FLAGS} ${ALL_URLS} ${NEGATIVE_END_BRACKETS}" +DEPEND="${DEPEND} + ${NEGATIVE_USE_FLAGS} + ${UNSHIELD_DEPEND} + app-arch/unzip + ${NEGATIVE_END_BRACKETS}" install_dvb_card() { [[ -z ${DVB_CARDS} ]] || use dvb_cards_${1} |