Fix installation of some firmwares if DVB_CARDS is unset. This fixes bug #284162. Ebuild cleanup.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 34 insertions, 19 deletions

diff --git a/media-tv/linuxtv-dvb-firmware/ChangeLog b/media-tv/linuxtv-dvb-firmware/ChangeLog
index 01331840a73a..8c3a90ca0846 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.24 2009/09/09 21:41:04 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/ChangeLog,v 1.25 2009/09/10 17:56:50 billie Exp $
+
+  10 Sep 2009; Pielmeier Daniel <billie@gentoo.org>
+  linuxtv-dvb-firmware-2009.07.06-r1.ebuild:
+  Fix installation of some firmwares if DVB_CARDS is unset. This fixes bug
+  #284162. Ebuild cleanup.
 
   09 Sep 2009; Pielmeier Daniel <billie@gentoo.org>
   linuxtv-dvb-firmware-2009.07.06-r1.ebuild:
diff --git a/media-tv/linuxtv-dvb-firmware/Manifest b/media-tv/linuxtv-dvb-firmware/Manifest
index 85e3d39f649d..8c7d93d8715c 100644
--- a/media-tv/linuxtv-dvb-firmware/Manifest
+++ b/media-tv/linuxtv-dvb-firmware/Manifest
@@ -36,7 +36,7 @@ DIST v4l-cx25840.fw 16382 RMD160 904d1921a2e12551b35776ee06bffe636e795c6b SHA1 f
 EBUILD linuxtv-dvb-firmware-1.ebuild 4650 RMD160 c2e1f60fab881f33237797d207edf571e3aafff6 SHA1 327948b85e53794f8c57f5f24b44e4cc3ea096bd SHA256 4622276cd5254414811ae3a03ba345c28c241dd12d523aea79a4aad424ef06a0
 EBUILD linuxtv-dvb-firmware-2006.11.13.ebuild 5767 RMD160 7f7e2441bf4417814ab37fdd371858529709e358 SHA1 3c3171252dae4b96ca8727d543f8101bb231a702 SHA256 d235d858f6089bd0172e34e3ca51911a56efbd1beb017b8e47996da54a5fa846
 EBUILD linuxtv-dvb-firmware-2007.04.13.ebuild 6973 RMD160 5d09ef4c6f8024a5067403be48d3d99e9d19347b SHA1 a52e6f0e91fe4c9814dd469bdbd3bf0baffca1de SHA256 82ae77fcd315303aeedc384b3d5a2d8a94ad226f4d7b4623f36460758d251360
-EBUILD linuxtv-dvb-firmware-2009.07.06-r1.ebuild 8642 RMD160 6a8cd082bf265e9c2b149c1a4961e86c2bc4c40d SHA1 878af6bab4231bb2c792985ee6d3e69507343c1f SHA256 0fca052e31fddcae28a73c50d1d4439dfe1bf309c99b88288acd066a1e33964b
+EBUILD linuxtv-dvb-firmware-2009.07.06-r1.ebuild 9013 RMD160 6c2b567880bf5eed949dd7aad9a0ada99a189207 SHA1 d19e8b1491577af5f953b2f2e1aa44c48f659ba0 SHA256 228c404412314d05618e1abf4ab2dd7b0d5b437833e536d0e24064ad5b31b332
 EBUILD linuxtv-dvb-firmware-2009.07.06.ebuild 8631 RMD160 720e5c647fe7d7b2f9beb9e20e00436a5f28ebe8 SHA1 4d4af8e9c0b749cbd5d8d0b6aa59dcb3184af926 SHA256 942324f55542ca6a805aafdf2b75fc4ae084ffefd0b0afca433c9449d3bfd518
-MISC ChangeLog 4768 RMD160 5e3a3b9c77900370253cb12b3ecd006f704314b6 SHA1 2d52b5f882158bf7c5d35da5c5b1478eab15bba6 SHA256 37bd581fea287c25da60fd87212f1ad96c70cfd1cf8dbaeab3e88c1280756bc2
+MISC ChangeLog 4968 RMD160 67f45c3ba1c51c6729987a1dbe30b64a2d214c37 SHA1 0c9aac7e2cb35c6015f9c99a0401367a40a9da02 SHA256 fe7f1c5057dc1b7a7daed5aadf1535b8f4fb33836e827f116356d9a9d1f26b0c
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
diff --git a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild
index 61eea2897a22..b62d30ef1e4b 100644
--- a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild
+++ b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-2009.07.06-r1.ebuild,v 1.2 2009/09/09 21:41:04 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.07.06-r1.ebuild,v 1.3 2009/09/10 17:56:50 billie Exp $
 
 DESCRIPTION="Firmware files needed for operation of some dvb-devices"
 HOMEPAGE="http://www.linuxtv.org"
@@ -239,7 +239,6 @@ DEPEND="${DEPEND}
 install_dvb_card() {
 	if [[ -z ${DVB_CARDS} ]]; then
 		# install (almost) all firmware files
-
 		# do not install this one due to conflicting filenames
 		[[ "${1}" != "tda10046lifeview" ]]
 	else
@@ -258,11 +257,14 @@ pkg_setup() {
 		eerror
 		eerror "But beware that you cannot enable tda10046 and"
 		eerror "tda10046lifeview at the same time."
-		eerror
 	fi
 
 	if [[ -z ${DVB_CARDS} ]]; then
+		elog
 		elog "DVB_CARDS is not set, installing all available firmware files."
+		elog "To save bandwidth please consider setting the DVB_CARDS variable"
+		elog "in ${ROOT%/}/etc/make.conf. This way only the firmwares you own"
+		elog "the hardware will be installed."
 	fi
 	# according to http://devmanual.gentoo.org/general-concepts/use-flags/index.html
 	# we should not die here. However, there is no sensible fallback choice to make
@@ -272,25 +274,29 @@ pkg_setup() {
 		eerror "You cannot have both tda10046 and tda10046lifeview in DVB_CARDS"
 		eerror "because of colliding firmware filenames (dvb-fe-tda10046.fw)."
 		eerror "Sorry."
-		eerror
 		die "Conflicting values for DVB_CARDS set."
 	fi
+	elog
 	elog "List of possible card-names to use for DVB_CARDS:"
 	echo ${FW_USE_FLAGS[*]}| tr ' ' '\n' | sort | uniq | fmt \
 	| while read line; do
 		elog "   ${line}"
 	done
+	elog
 	elog "If you need another firmware file and want it included create a bug"
 	elog "at bugs.gentoo.org."
-	elog "If some firmware sources are not fetchable anymore please also report"
-	elog "a bug. If there is no alternative source or an update to the firmware"
-	elog "available we have to remove it from this ebuild and you are on your own."
+	elog "In case some firmware sources are not fetchable please try again at"
+	elog "a later time and if it still does not fetch report a bug. If there"
+	elog "is no alternative source or an update to the firmware available we"
+	elog "have to remove it from the ebuild and you are on your own."
 }
 
 src_unpack() {
+	local distfile
+
 	# link all downloaded files to ${S}
-	for f in ${A}; do
-		[[ -L ${f} ]] || ln -s ${DISTDIR}/${f} ${f}
+	for distfile in ${A}; do
+		[[ -L ${distfile} ]] || ln -s ${DISTDIR}/${distfile} ${distfile}
 	done
 
 	# unpack firmware-packet
@@ -298,13 +304,17 @@ src_unpack() {
 		unpack ${PACKET_NAME}
 	fi
 
-	use dvb_cards_mpc718 && mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip"
-	use dvb_cards_ttpci && mv dvb-ttpci-01.fw-fc2624 dvb-ttpci-01.fw
+	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_mpc718 ; then
+		mv Yuan%20MPC718%20TV%20Tuner%20Card%202.13.10.1016.zip "Yuan MPC718 TV Tuner Card 2.13.10.1016.zip"
+	fi
+	if [[ -z ${DVB_CARDS} ]] || use dvb_cards_ttpci ; then
+		mv dvb-ttpci-01.fw-fc2624 dvb-ttpci-01.fw
+	fi
 
-	SCRIPT_V=${PV}
+	local script_v=${PV}
 
 	# Adjust temp-dir of get_dvb_firmware
-	sed "${FILESDIR}"/get_dvb_firmware-${SCRIPT_V} \
+	sed "${FILESDIR}"/get_dvb_firmware-${script_v} \
 		-e "s#/tmp#${T}#g" > get_dvb_firmware
 	chmod a+x get_dvb_firmware
 
@@ -326,9 +336,9 @@ src_install() {
 
 	for ((CARD=0; CARD < ${#FW_USE_FLAGS[*]}; CARD++)) do
 		if install_dvb_card ${FW_USE_FLAGS[CARD]}; then
-			local FILE=${FW_FILES[CARD]}
-			[[ -f ${FILE} ]] || die "File ${FILE} does not exist!"
-			doins ${FILE}
+			local file=${FW_FILES[CARD]}
+			[[ -f ${file} ]] || die "File ${file} does not exist!"
+			doins ${file}
 		fi
 	done
 }