From 76ceb9cc76aaec6fced7d60f5e9ee804f35890a9 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 26 Feb 2008 02:38:17 +0000 Subject: [PATCH] Added sys-fs/dmraid for bug #102736, commenting net-wireless/madwifi-ng-tools due to licensing on net-wireless/madwifi-ng, added net-wireless/iwl3945-ucode and net-wireless/iwl4965-ucode, and adding net-wireless/ipw3945. svn path=/trunk/; revision=439 --- releases/2008.0/ChangeLog | 13 +++++++++++++ releases/2008.0/specs/amd64/installcd-stage1.spec | 12 ++++-------- .../specs/amd64/installcd-stage2-minimal.spec | 2 +- releases/2008.0/specs/amd64/livecd-stage1.spec | 10 ++++------ releases/2008.0/specs/amd64/livecd-stage2.spec | 3 ++- releases/2008.0/specs/amd64/livedvd-stage1.spec | 10 ++++------ releases/2008.0/specs/amd64/livedvd-stage2.spec | 1 + .../2008.0/specs/x86/hardened/installcd-stage1.spec | 4 +++- releases/2008.0/specs/x86/i686/livecd-stage1.spec | 3 +++ releases/2008.0/specs/x86/i686/livecd-stage2.spec | 2 +- releases/2008.0/specs/x86/i686/livedvd-stage1.spec | 3 +++ releases/2008.0/specs/x86/i686/livedvd-stage2.spec | 2 +- releases/2008.0/specs/x86/installcd-stage1.spec | 4 +++- 13 files changed, 43 insertions(+), 26 deletions(-) diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog index 8234c268..62739815 100644 --- a/releases/2008.0/ChangeLog +++ b/releases/2008.0/ChangeLog @@ -2,6 +2,19 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Feb 2008; Chris Gianelloni + specs/amd64/installcd-stage1.spec, + specs/amd64/installcd-stage2-minimal.spec, specs/amd64/livecd-stage1.spec, + specs/amd64/livecd-stage2.spec, specs/amd64/livedvd-stage1.spec, + specs/amd64/livedvd-stage2.spec, specs/x86/hardened/installcd-stage1.spec, + specs/x86/i686/livecd-stage1.spec, specs/x86/i686/livecd-stage2.spec, + specs/x86/i686/livedvd-stage1.spec, specs/x86/i686/livedvd-stage2.spec, + specs/x86/installcd-stage1.spec: + Added sys-fs/dmraid for bug #102736, commenting + net-wireless/madwifi-ng-tools due to licensing on net-wireless/madwifi-ng, + added net-wireless/iwl3945-ucode and net-wireless/iwl4965-ucode, and adding + net-wireless/ipw3945. + 24 Feb 2008; Raúl Porcel specs/sparc/sparc64/installcd-stage1.spec, specs/sparc/sparc64/installcd-stage2-minimal.spec: diff --git a/releases/2008.0/specs/amd64/installcd-stage1.spec b/releases/2008.0/specs/amd64/installcd-stage1.spec index 9565f728..f25d39ee 100644 --- a/releases/2008.0/specs/amd64/installcd-stage1.spec +++ b/releases/2008.0/specs/amd64/installcd-stage1.spec @@ -50,17 +50,14 @@ livecd/packages: net-misc/ntp net-misc/rdate net-misc/vconfig -### Masked (no keywords) -# net-wireless/ipw2100-firmware -### Masked (~amd64) -# net-wireless/ipw2200-firmware + net-wireless/ipw2100-firmware + net-wireless/ipw2200-firmware net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant -### Masked (~amd64) -# net-wireless/zd1201-firmware + net-wireless/zd1201-firmware net-wireless/zd1211-firmware sys-apps/apmd sys-apps/eject @@ -90,8 +87,7 @@ livecd/packages: # sys-devel/binutils-hppa64 ### Masked (no keywords) # sys-devel/gcc-hppa64 -### Masked (~amd64) -# sys-fs/dmraid + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms diff --git a/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec b/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec index 4496a733..b9d7a9d6 100644 --- a/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/2008.0/specs/amd64/installcd-stage2-minimal.spec @@ -28,7 +28,7 @@ boot/kernel/gentoo/packages: # net-wireless/rtl8187 # net-wireless/adm8211 # net-wireless/acx -# net-wireless/ipw3945 + net-wireless/ipw3945 net-wireless/rt2500 livecd/unmerge: diff --git a/releases/2008.0/specs/amd64/livecd-stage1.spec b/releases/2008.0/specs/amd64/livecd-stage1.spec index c24378b4..70d366fb 100644 --- a/releases/2008.0/specs/amd64/livecd-stage1.spec +++ b/releases/2008.0/specs/amd64/livecd-stage1.spec @@ -69,17 +69,14 @@ livecd/packages: net-p2p/bittorrent net-proxy/dante net-proxy/tsocks -### Masked (no keywords) -# net-wireless/ipw2100-firmware -### Masked (~amd64) -# net-wireless/ipw2200-firmware + net-wireless/ipw2100-firmware + net-wireless/ipw2200-firmware net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant -### Masked (~amd64) -# net-wireless/zd1201-firmware + net-wireless/zd1201-firmware net-wireless/zd1211-firmware ### Masked (no keywords) # sys-apps/apmd @@ -126,6 +123,7 @@ livecd/packages: sys-devel/distcc ### Masked (no keywords) # sys-devel/gcc-hppa64 + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms diff --git a/releases/2008.0/specs/amd64/livecd-stage2.spec b/releases/2008.0/specs/amd64/livecd-stage2.spec index 66d6d0c4..9cf3f06b 100644 --- a/releases/2008.0/specs/amd64/livecd-stage2.spec +++ b/releases/2008.0/specs/amd64/livecd-stage2.spec @@ -41,7 +41,8 @@ boot/kernel/gentoo/packages: ### Masked (~amd64) # net-wireless/acx net-wireless/hostap-utils - net-wireless/madwifi-ng-tools + net-wireless/ipw3945 +# net-wireless/madwifi-ng-tools net-wireless/rt2500 ### Masked (~amd64) # net-wireless/rtl8187 diff --git a/releases/2008.0/specs/amd64/livedvd-stage1.spec b/releases/2008.0/specs/amd64/livedvd-stage1.spec index eda2a3d1..57e35172 100644 --- a/releases/2008.0/specs/amd64/livedvd-stage1.spec +++ b/releases/2008.0/specs/amd64/livedvd-stage1.spec @@ -169,10 +169,8 @@ livecd/packages: ### Masked (~amd64) # net-wireless/airsnort net-wireless/gnome-bluetooth -### Masked (no keyword) -# net-wireless/ipw2100-firmware -### Masked (~amd64) -# net-wireless/ipw2200-firmware + net-wireless/ipw2100-firmware + net-wireless/ipw2200-firmware net-wireless/iwl3945-ucode net-wireless/iwl4965-ucode net-wireless/kdebluetooth @@ -180,8 +178,7 @@ livecd/packages: net-wireless/wepattack net-wireless/wireless-tools net-wireless/wpa_supplicant -### Masked (~amd64) -# net-wireless/zd1201-firmware + net-wireless/zd1201-firmware net-wireless/zd1211-firmware rox-base/rox ### Masked @@ -243,6 +240,7 @@ livecd/packages: ### Masked (no keyword) # sys-devel/gcc-hppa64 sys-devel/gdb + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms diff --git a/releases/2008.0/specs/amd64/livedvd-stage2.spec b/releases/2008.0/specs/amd64/livedvd-stage2.spec index 12499d5a..a0984121 100644 --- a/releases/2008.0/specs/amd64/livedvd-stage2.spec +++ b/releases/2008.0/specs/amd64/livedvd-stage2.spec @@ -42,6 +42,7 @@ boot/kernel/gentoo/packages: ### Masked (~amd64) # net-wireless/acx net-wireless/hostap-utils + net-wireless/ipw3945 # net-wireless/madwifi-ng-tools net-wireless/rt2500 ### Masked (~amd64) diff --git a/releases/2008.0/specs/x86/hardened/installcd-stage1.spec b/releases/2008.0/specs/x86/hardened/installcd-stage1.spec index ba7a5a15..a95f37b3 100644 --- a/releases/2008.0/specs/x86/hardened/installcd-stage1.spec +++ b/releases/2008.0/specs/x86/hardened/installcd-stage1.spec @@ -47,6 +47,8 @@ livecd/packages: net-misc/vconfig net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware + net-wireless/iwl3945-ucode + net-wireless/iwl4965-ucode net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant @@ -72,7 +74,7 @@ livecd/packages: # sys-boot/yaboot # sys-devel/binutils-hppa64 # sys-devel/gcc-hppa64 -# sys-fs/dmraid + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms diff --git a/releases/2008.0/specs/x86/i686/livecd-stage1.spec b/releases/2008.0/specs/x86/i686/livecd-stage1.spec index a3391cc4..e38095e8 100644 --- a/releases/2008.0/specs/x86/i686/livecd-stage1.spec +++ b/releases/2008.0/specs/x86/i686/livecd-stage1.spec @@ -71,6 +71,8 @@ livecd/packages: net-proxy/tsocks net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware + net-wireless/iwl3945-ucode + net-wireless/iwl4965-ucode net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant @@ -108,6 +110,7 @@ livecd/packages: # sys-devel/binutils-hppa64 sys-devel/distcc # sys-devel/gcc-hppa64 + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms diff --git a/releases/2008.0/specs/x86/i686/livecd-stage2.spec b/releases/2008.0/specs/x86/i686/livecd-stage2.spec index 9053a824..cfdcd0f2 100644 --- a/releases/2008.0/specs/x86/i686/livecd-stage2.spec +++ b/releases/2008.0/specs/x86/i686/livecd-stage2.spec @@ -38,7 +38,7 @@ boot/kernel/gentoo/packages: # net-wireless/acx net-wireless/hostap-utils net-wireless/ipw3945 - net-wireless/madwifi-ng-tools +# net-wireless/madwifi-ng-tools net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils diff --git a/releases/2008.0/specs/x86/i686/livedvd-stage1.spec b/releases/2008.0/specs/x86/i686/livedvd-stage1.spec index eda18a08..5f5e570e 100644 --- a/releases/2008.0/specs/x86/i686/livedvd-stage1.spec +++ b/releases/2008.0/specs/x86/i686/livedvd-stage1.spec @@ -163,6 +163,8 @@ livecd/packages: net-wireless/gnome-bluetooth net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware + net-wireless/iwl3945-ucode + net-wireless/iwl4965-ucode net-wireless/kdebluetooth net-wireless/prism54-firmware net-wireless/wepattack @@ -214,6 +216,7 @@ livecd/packages: sys-devel/distcc # sys-devel/gcc-hppa64 sys-devel/gdb + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms diff --git a/releases/2008.0/specs/x86/i686/livedvd-stage2.spec b/releases/2008.0/specs/x86/i686/livedvd-stage2.spec index a0808f10..36d64713 100644 --- a/releases/2008.0/specs/x86/i686/livedvd-stage2.spec +++ b/releases/2008.0/specs/x86/i686/livedvd-stage2.spec @@ -40,7 +40,7 @@ boot/kernel/gentoo/packages: net-wireless/hostap-utils net-wireless/kismet net-wireless/ipw3945 - net-wireless/madwifi-ng-tools +# net-wireless/madwifi-ng-tools net-wireless/rt2500 # net-wireless/rtl8187 sys-apps/pcmciautils diff --git a/releases/2008.0/specs/x86/installcd-stage1.spec b/releases/2008.0/specs/x86/installcd-stage1.spec index bb33d375..3a579324 100644 --- a/releases/2008.0/specs/x86/installcd-stage1.spec +++ b/releases/2008.0/specs/x86/installcd-stage1.spec @@ -49,6 +49,8 @@ livecd/packages: net-misc/vconfig net-wireless/ipw2100-firmware net-wireless/ipw2200-firmware + net-wireless/iwl3945-ucode + net-wireless/iwl4965-ucode net-wireless/prism54-firmware net-wireless/wireless-tools net-wireless/wpa_supplicant @@ -74,7 +76,7 @@ livecd/packages: # sys-boot/yaboot # sys-devel/binutils-hppa64 # sys-devel/gcc-hppa64 -# sys-fs/dmraid + sys-fs/dmraid sys-fs/dosfstools sys-fs/e2fsprogs sys-fs/evms