[gentoo-commits] gentoo-x86 commit in sys-kernel/linux-firmware: metadata.xml ChangeLog linux-firmware-20110601.ebuild linux-firmware-99999999.ebuild linux-firmware-20110128.ebuild linux-firmware-20090421.ebuild linux-firmware-20100930.ebuild linux-firmware-20110311.ebuild

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/06/02 00:12:53

  Modified:             metadata.xml ChangeLog
                        linux-firmware-99999999.ebuild
  Added:                linux-firmware-20110601.ebuild
  Removed:              linux-firmware-20110128.ebuild
                        linux-firmware-20090421.ebuild
                        linux-firmware-20100930.ebuild
                        linux-firmware-20110311.ebuild
  Log:
  New snapshot. Update live ebuild to git-2.eclass, allow individual selection of firmware files through savedconfig. Remove old.
  
  (Portage version: 2.2.0_alpha34/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sys-kernel/linux-firmware/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	4 Apr 2011 13:51:55 -0000	1.2
+++ metadata.xml	2 Jun 2011 00:12:53 -0000	1.3
@@ -10,4 +10,7 @@
 	<email>chithanh@g.o</email>
 	<name>Chí-Thanh Christopher Nguyễn</name>
 </maintainer>
+<use>
+	<flag name='savedconfig'>Allows individual selection of firmware files</flag>
+</use>
 </pkgmetadata>



1.16                 sys-kernel/linux-firmware/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	31 May 2011 15:45:24 -0000	1.15
+++ ChangeLog	2 Jun 2011 00:12:53 -0000	1.16
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.15 2011/05/31 15:45:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.16 2011/06/02 00:12:53 chithanh Exp $
+
+*linux-firmware-20110601 (02 Jun 2011)
+
+  02 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
+  -linux-firmware-20090421.ebuild, -linux-firmware-20100930.ebuild,
+  -linux-firmware-20110128.ebuild, -linux-firmware-20110311.ebuild,
+  +linux-firmware-20110601.ebuild, linux-firmware-99999999.ebuild,
+  metadata.xml:
+  New snapshot. Update live ebuild to git-2.eclass, allow individual selection
+  of firmware files through savedconfig. Remove old.
 
   31 May 2011; Pawel Hajdan jr <phajdan.jr@g.o>
   linux-firmware-20110429.ebuild:



1.8                  sys-kernel/linux-firmware/linux-firmware-99999999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild?r1=1.7&r2=1.8

Index: linux-firmware-99999999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-firmware-99999999.ebuild	15 Mar 2011 01:11:22 -0000	1.7
+++ linux-firmware-99999999.ebuild	2 Jun 2011 00:12:53 -0000	1.8
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.7 2011/03/15 01:11:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.8 2011/06/02 00:12:53 chithanh Exp $
 
 EAPI=3
+inherit savedconfig
 
 if [[ ${PV} == 99999999* ]]; then
-	inherit git
+	inherit git-2
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
 else
@@ -18,34 +19,63 @@
 LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
 KEYWORDS=""
 SLOT="0"
-IUSE=""
+IUSE="savedconfig"
 
 DEPEND=""
-RDEPEND="!media-sound/alsa-firmware[alsa_cards_korg1212]
-	!media-sound/alsa-firmware[alsa_cards_maestro3]
-	!media-sound/alsa-firmware[alsa_cards_sb16]
-	!media-sound/alsa-firmware[alsa_cards_ymfpci]
-	!media-tv/cx18-firmware
-	!media-tv/ivtv-firmware
-	!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-	!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-	!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-	!net-wireless/libertas-firmware
-	!net-wireless/i2400m-fw
-	!net-wireless/iwl1000-ucode
-	!net-wireless/iwl3945-ucode
-	!net-wireless/iwl4965-ucode
-	!net-wireless/iwl5000-ucode
-	!net-wireless/iwl5150-ucode
-	!net-wireless/iwl6000-ucode
-	!net-wireless/iwl6050-ucode
-	!net-wireless/rt61-firmware
-	!net-wireless/rt73-firmware
-	!sys-block/qla-fc-firmware
-	!x11-drivers/radeon-ucode"
+RDEPEND="!savedconfig? (
+		!media-sound/alsa-firmware[alsa_cards_korg1212]
+		!media-sound/alsa-firmware[alsa_cards_maestro3]
+		!media-sound/alsa-firmware[alsa_cards_sb16]
+		!media-sound/alsa-firmware[alsa_cards_ymfpci]
+		!media-tv/cx18-firmware
+		!media-tv/ivtv-firmware
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
+		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
+		!net-wireless/i2400m-fw
+		!net-wireless/iwl1000-ucode
+		!net-wireless/iwl3945-ucode
+		!net-wireless/iwl4965-ucode
+		!net-wireless/iwl5000-ucode
+		!net-wireless/iwl5150-ucode
+		!net-wireless/iwl6000-ucode
+		!net-wireless/iwl6050-ucode
+		!net-wireless/libertas-firmware
+		!net-wireless/rt61-firmware
+		!net-wireless/rt73-firmware
+		!sys-block/qla-fc-firmware
+		!x11-drivers/radeon-ucode
+	)"
 #add anything else that collides to this
 
+src_prepare() {
+	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
+	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
+
+	if use savedconfig; then
+		restore_config ${PN}.conf
+		ebegin "Removing all files not listed in config"
+		find * \( \! -type d -and \! -name ${PN}.conf \) \
+			| sort ${PN}.conf ${PN}.conf - \
+			| uniq -u | xargs -r rm
+		eend $? || die
+	fi
+}
+
 src_install() {
+	save_config ${PN}.conf
+	rm ${PN}.conf || die
 	insinto /lib/firmware/
 	doins -r * || die "Install failed!"
 }
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+}



1.1                  sys-kernel/linux-firmware/linux-firmware-20110601.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild?rev=1.1&content-type=text/plain

Index: linux-firmware-20110601.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110601.ebuild,v 1.1 2011/06/02 00:12:53 chithanh Exp $

EAPI=3
inherit savedconfig

if [[ ${PV} == 99999999* ]]; then
	inherit git-2
	SRC_URI=""
	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
else
	SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2"
fi

DESCRIPTION="Linux firmware files"
HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"

LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
KEYWORDS="~amd64 ~arm ~x86"
SLOT="0"
IUSE="savedconfig"

DEPEND=""
RDEPEND="!savedconfig? (
		!media-sound/alsa-firmware[alsa_cards_korg1212]
		!media-sound/alsa-firmware[alsa_cards_maestro3]
		!media-sound/alsa-firmware[alsa_cards_sb16]
		!media-sound/alsa-firmware[alsa_cards_ymfpci]
		!media-tv/cx18-firmware
		!media-tv/ivtv-firmware
		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
		!net-wireless/i2400m-fw
		!net-wireless/iwl1000-ucode
		!net-wireless/iwl3945-ucode
		!net-wireless/iwl4965-ucode
		!net-wireless/iwl5000-ucode
		!net-wireless/iwl5150-ucode
		!net-wireless/iwl6000-ucode
		!net-wireless/iwl6050-ucode
		!net-wireless/libertas-firmware
		!net-wireless/rt61-firmware
		!net-wireless/rt73-firmware
		!sys-block/qla-fc-firmware
		!x11-drivers/radeon-ucode
	)"
#add anything else that collides to this

src_prepare() {
	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf

	if use savedconfig; then
		restore_config ${PN}.conf
		ebegin "Removing all files not listed in config"
		find * \( \! -type d -and \! -name ${PN}.conf \) \
			| sort ${PN}.conf ${PN}.conf - \
			| uniq -u | xargs -r rm
		eend $? || die
	fi
}

src_install() {
	save_config ${PN}.conf
	rm ${PN}.conf || die
	insinto /lib/firmware/
	doins -r * || die "Install failed!"
}

pkg_preinst() {
	if use savedconfig; then
		ewarn "USE=savedconfig is active. You must handle file collisions manually."
	fi
}

pkg_postinst() {
	elog "If you are only interested in particular firmware files, edit the saved"
	elog "configfile and remove those that you do not want."
}