From 34af0c0b93ac11c5c38de649db466cba3646eb2a Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Thu, 9 Nov 2006 17:24:59 +0000 Subject: Make ebuild also depend on unshield when no DVB_CARD is defined and all are installed. Package-Manager: portage-2.1.2_rc1-r5 --- media-tv/linuxtv-dvb-firmware/ChangeLog | 7 ++++++- media-tv/linuxtv-dvb-firmware/Manifest | 22 +++++++++++----------- .../linuxtv-dvb-firmware-2006.11.08.ebuild | 21 +++++++++++---------- 3 files changed, 28 insertions(+), 22 deletions(-) (limited to 'media-tv') 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 + 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/Manifest b/media-tv/linuxtv-dvb-firmware/Manifest index 34063d021d60..74860351a6d1 100644 --- a/media-tv/linuxtv-dvb-firmware/Manifest +++ b/media-tv/linuxtv-dvb-firmware/Manifest @@ -24,14 +24,14 @@ EBUILD linuxtv-dvb-firmware-1.ebuild 4631 RMD160 512a80c00bca6d30d7738b199df9ca2 MD5 163c3adc7d30237a362c826acd9c5650 linuxtv-dvb-firmware-1.ebuild 4631 RMD160 512a80c00bca6d30d7738b199df9ca2eb86d7e82 linuxtv-dvb-firmware-1.ebuild 4631 SHA256 a529027e0a558b5ed27e2b1f9c714d579e4a445459bd67c12e0604a250f578aa linuxtv-dvb-firmware-1.ebuild 4631 -EBUILD linuxtv-dvb-firmware-2006.11.08.ebuild 5593 RMD160 31269536992bb3fdcfbcb977cb8e32ddb4e0d43b SHA1 6709233684ab4dcfb06ec94a5b0460e8c338e1f3 SHA256 93e175d569651919aa9b8359c97bfa937e8095a4cc2295a8d059711b7e584f7b -MD5 351a12a04a61d58921750cdbdf40aebb linuxtv-dvb-firmware-2006.11.08.ebuild 5593 -RMD160 31269536992bb3fdcfbcb977cb8e32ddb4e0d43b linuxtv-dvb-firmware-2006.11.08.ebuild 5593 -SHA256 93e175d569651919aa9b8359c97bfa937e8095a4cc2295a8d059711b7e584f7b linuxtv-dvb-firmware-2006.11.08.ebuild 5593 -MISC ChangeLog 1555 RMD160 22a13c70fd7b9b4c8f840db8b2d449fecfc85d4b SHA1 0d3aff3c879e6860f38dc0326758070b77343052 SHA256 e7a9770d17323cf866858b8e9baf98b29550973259b5b5c470454e7438ee725f -MD5 8f19767f19a0386737845da0dd0d0b57 ChangeLog 1555 -RMD160 22a13c70fd7b9b4c8f840db8b2d449fecfc85d4b ChangeLog 1555 -SHA256 e7a9770d17323cf866858b8e9baf98b29550973259b5b5c470454e7438ee725f ChangeLog 1555 +EBUILD linuxtv-dvb-firmware-2006.11.08.ebuild 5641 RMD160 14223e1524b71b3d42b2f8f2330f0253330490b2 SHA1 0e075eb655b12866b2c7074bf88953ddf389647e SHA256 708b8046f0c02ba96b7dcc86bcddd3f01e7875592e593efcca7d15263b7fe02c +MD5 50f74dd62d8d59fcd375f35e4c174691 linuxtv-dvb-firmware-2006.11.08.ebuild 5641 +RMD160 14223e1524b71b3d42b2f8f2330f0253330490b2 linuxtv-dvb-firmware-2006.11.08.ebuild 5641 +SHA256 708b8046f0c02ba96b7dcc86bcddd3f01e7875592e593efcca7d15263b7fe02c linuxtv-dvb-firmware-2006.11.08.ebuild 5641 +MISC ChangeLog 1742 RMD160 a181da1d24a39356ee46b45dcf682bd71c3e0203 SHA1 9b5cea8035143406e829e0c76376380aecfb4421 SHA256 54c7c62353af9b80f84db20b754203b3e3ef712f3262f6ef85f03effc2201bb3 +MD5 84cd48d7fa9fdbc6b48caa174a6abd4a ChangeLog 1742 +RMD160 a181da1d24a39356ee46b45dcf682bd71c3e0203 ChangeLog 1742 +SHA256 54c7c62353af9b80f84db20b754203b3e3ef712f3262f6ef85f03effc2201bb3 ChangeLog 1742 MISC metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c SHA1 4c00933e1ed60039fae091034d83e28d0890e87c SHA256 29feafd8b7177b65f8bd92553ac96779d9a91e3b7b4eeecfb0924eb7b6979587 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300 RMD160 c85719cef743cf573efe73f8f84564292085c91c metadata.xml 300 @@ -45,7 +45,7 @@ SHA256 eee22fbd55bed5288cdc03454bba4c402176e598414946576c280738004f129e files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFUjEyt2vP6XvVdOcRAvs/AKDamrzy0rhK46W1MxyXxJdU62irVQCeN9y2 -byjtTVyxPeEDIlqYNfpUoI0= -=QK8y +iD8DBQFFU2R7t2vP6XvVdOcRAg79AJ4wt7NjoiDuXJmAeUHmckAZW336oQCePCg3 +IRG4ucG5OLOPaSBzY1B7hKw= +=2vnx -----END PGP SIGNATURE----- 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} -- cgit v1.2.3-65-gdbad