Lots of cleanup in the specs. Removed USE=atm since linux-atm is broken, removed fcdsl/fritzcapi since they're broken. I also commented out stuff known to eaither not build or that had to be changed due to size restrictions on the LiveCD. Changed from using the -bin packages for OpenOffice.org/Firefox/Thunderbird, which means we'll be getting that 'Bon Echo' crap.

svn path=/trunk/; revision=278
This commit is contained in:
Chris Gianelloni 2007-03-12 21:03:23 +00:00
parent 9cf4e2c178
commit 9fb2a9aefb
13 changed files with 50 additions and 56 deletions

View file

@ -1,5 +1,19 @@
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.39 2007-03-12 19:14:15 wolf31o2 Exp $ # $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.40 2007-03-12 21:03:23 wolf31o2 Exp $
12 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
alpha/livecd-stage1-gnome.spec, amd64/installcd-stage1-minimal.spec,
amd64/livecd-stage1-gnome.spec, amd64/livedvd-stage1-large.spec,
ia64/livecd-stage1-gnome.spec, ppc/ppc32/livecd-stage1-gnome.spec,
x86/i686/livecd-stage1-gnome.spec, x86/i686/livecd-stage2-gnome.spec,
x86/i686/livedvd-stage1-large.spec, x86/i686/livedvd-stage2-large.spec,
x86/installcd-stage1-minimal.spec, x86/installcd-stage2-minimal.spec:
Lots of cleanup in the specs. Removed USE=atm since linux-atm is broken,
removed fcdsl/fritzcapi since they're broken. I also commented out stuff
known to eaither not build or that had to be changed due to size
restrictions on the LiveCD. Changed from using the -bin packages for
OpenOffice.org/Firefox/Thunderbird, which means we'll be getting that 'Bon
Echo' crap.
12 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/stage1.spec, 12 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/stage1.spec,
alpha/stage2-desktop.spec, alpha/stage3-desktop.spec: alpha/stage2-desktop.spec, alpha/stage3-desktop.spec:

View file

@ -6,7 +6,6 @@ profile: default-linux/alpha/2007.0/desktop
snapshot: 2007.0 snapshot: 2007.0
source_subpath: default/stage3-alpha-desktop-2007.0 source_subpath: default/stage3-alpha-desktop-2007.0
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -19,8 +18,6 @@ livecd/packages:
app-admin/sudo app-admin/sudo
app-admin/syslog-ng app-admin/syslog-ng
app-arch/mt-st app-arch/mt-st
app-arch/unrar
app-arch/unzip
# app-benchmarks/cpuburn # app-benchmarks/cpuburn
app-cdr/cdrtools app-cdr/cdrtools
app-crypt/gnupg app-crypt/gnupg

View file

@ -7,7 +7,6 @@ snapshot: 2007.0
source_subpath: default/stage3-amd64-2007.0 source_subpath: default/stage3-amd64-2007.0
livecd/use: livecd/use:
-* -*
atm
fbcon fbcon
ipv6 ipv6
livecd livecd

View file

@ -6,7 +6,6 @@ profile: default-linux/amd64/2007.0/desktop
snapshot: 2007.0 snapshot: 2007.0
source_subpath: default/stage3-amd64-desktop-2007.0 source_subpath: default/stage3-amd64-desktop-2007.0
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -19,30 +18,27 @@ livecd/packages:
app-admin/sudo app-admin/sudo
app-admin/syslog-ng app-admin/syslog-ng
app-arch/mt-st app-arch/mt-st
app-arch/unrar
app-arch/unzip
app-benchmarks/cpuburn app-benchmarks/cpuburn
app-cdr/cdrkit app-cdr/cdrkit
app-crypt/gnupg app-crypt/gnupg
app-editors/emacs # app-editors/emacs
app-editors/vim app-editors/vim
app-misc/livecd-tools app-misc/livecd-tools
app-misc/screen app-misc/screen
app-misc/vlock app-misc/vlock
app-office/openoffice-bin app-office/openoffice
app-portage/gentoolkit app-portage/gentoolkit
app-portage/mirrorselect app-portage/mirrorselect
app-portage/ufed app-portage/ufed
dev-util/ccache dev-util/ccache
gnome-base/gnome gnome-base/gnome
mail-client/evolution mail-client/mozilla-thunderbird
mail-client/mozilla-thunderbird-bin
media-gfx/fbgrab media-gfx/fbgrab
media-sound/audacious media-sound/audacious
net-analyzer/netcat net-analyzer/netcat
net-analyzer/nmap net-analyzer/nmap
net-analyzer/tcpdump net-analyzer/tcpdump
net-analyzer/tcptraceroute # net-analyzer/tcptraceroute
net-analyzer/traceroute net-analyzer/traceroute
net-dialup/bpalogin net-dialup/bpalogin
net-dialup/mingetty net-dialup/mingetty
@ -95,7 +91,7 @@ livecd/packages:
# sys-boot/aboot # sys-boot/aboot
# sys-boot/elilo # sys-boot/elilo
sys-boot/grub sys-boot/grub
sys-boot/lilo # sys-boot/lilo
sys-boot/syslinux sys-boot/syslinux
# sys-boot/yaboot # sys-boot/yaboot
# sys-devel/binutils-hppa64 # sys-devel/binutils-hppa64
@ -121,7 +117,7 @@ livecd/packages:
sys-power/acpid sys-power/acpid
sys-process/vixie-cron sys-process/vixie-cron
www-client/links www-client/links
www-client/mozilla-firefox-bin www-client/mozilla-firefox
x11-base/xorg-x11 x11-base/xorg-x11
x11-drivers/synaptics x11-drivers/synaptics
x11-misc/xscreensaver x11-misc/xscreensaver

View file

@ -7,7 +7,6 @@ snapshot: 2007.0
source_subpath: default/stage3-amd64-2007.0 source_subpath: default/stage3-amd64-2007.0
portage_overlay: /root/livecd/overlays/amd64-portage portage_overlay: /root/livecd/overlays/amd64-portage
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -31,13 +30,12 @@ livecd/packages:
app-editors/emacs app-editors/emacs
app-editors/vim app-editors/vim
app-editors/xemacs app-editors/xemacs
app-misc/beagle # app-misc/beagle
app-misc/livecd-tools app-misc/livecd-tools
app-misc/screen app-misc/screen
app-misc/vlock app-misc/vlock
app-office/koffice app-office/koffice
# app-office/openoffice app-office/openoffice
app-office/openoffice-bin
app-office/scribus app-office/scribus
app-portage/gentoolkit app-portage/gentoolkit
app-portage/mirrorselect app-portage/mirrorselect

View file

@ -6,7 +6,6 @@ profile: default-linux/ia64/2007.0/desktop
snapshot: 2007.0 snapshot: 2007.0
source_subpath: default/stage3-ia64-desktop-2007.0 source_subpath: default/stage3-ia64-desktop-2007.0
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -19,8 +18,6 @@ livecd/packages:
app-admin/sudo app-admin/sudo
app-admin/syslog-ng app-admin/syslog-ng
app-arch/mt-st app-arch/mt-st
app-arch/unrar
app-arch/unzip
app-benchmarks/cpuburn app-benchmarks/cpuburn
app-cdr/cdrkit app-cdr/cdrkit
app-crypt/gnupg app-crypt/gnupg
@ -29,14 +26,14 @@ livecd/packages:
app-misc/livecd-tools app-misc/livecd-tools
app-misc/screen app-misc/screen
app-misc/vlock app-misc/vlock
app-office/openoffice-bin app-office/openoffice
app-portage/gentoolkit app-portage/gentoolkit
app-portage/mirrorselect app-portage/mirrorselect
app-portage/ufed app-portage/ufed
dev-util/ccache dev-util/ccache
gnome-base/gnome gnome-base/gnome
mail-client/evolution mail-client/evolution
mail-client/mozilla-thunderbird-bin mail-client/mozilla-thunderbird
media-gfx/fbgrab media-gfx/fbgrab
media-sound/audacious media-sound/audacious
net-analyzer/netcat net-analyzer/netcat
@ -121,7 +118,7 @@ livecd/packages:
sys-power/acpid sys-power/acpid
sys-process/vixie-cron sys-process/vixie-cron
www-client/links www-client/links
www-client/mozilla-firefox-bin www-client/mozilla-firefox
x11-base/xorg-x11 x11-base/xorg-x11
x11-drivers/synaptics x11-drivers/synaptics
x11-misc/xscreensaver x11-misc/xscreensaver

View file

@ -6,7 +6,6 @@ profile: default-linux/ppc/ppc32/2007.0/desktop
snapshot: 2007.0 snapshot: 2007.0
source_subpath: default/stage3-ppc-desktop-2007.0 source_subpath: default/stage3-ppc-desktop-2007.0
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -19,10 +18,8 @@ livecd/packages:
app-admin/sudo app-admin/sudo
app-admin/syslog-ng app-admin/syslog-ng
app-arch/mt-st app-arch/mt-st
app-arch/unrar
app-arch/unzip
# app-benchmarks/cpuburn # app-benchmarks/cpuburn
app-cdr/cdrtools app-cdr/cdrkit
# app-cdr/k3b # app-cdr/k3b
app-crypt/gnupg app-crypt/gnupg
app-editors/emacs app-editors/emacs

View file

@ -6,7 +6,6 @@ profile: default-linux/x86/2007.0/desktop
snapshot: 2007.0 snapshot: 2007.0
source_subpath: default/stage3-i686-desktop-2007.0 source_subpath: default/stage3-i686-desktop-2007.0
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -24,19 +23,18 @@ livecd/packages:
app-benchmarks/cpuburn app-benchmarks/cpuburn
app-cdr/cdrkit app-cdr/cdrkit
app-crypt/gnupg app-crypt/gnupg
app-editors/emacs # app-editors/emacs
app-editors/vim app-editors/vim
app-misc/livecd-tools app-misc/livecd-tools
app-misc/screen app-misc/screen
app-misc/vlock app-misc/vlock
app-office/openoffice-bin app-office/openoffice
app-portage/gentoolkit app-portage/gentoolkit
app-portage/mirrorselect app-portage/mirrorselect
app-portage/ufed app-portage/ufed
dev-util/ccache dev-util/ccache
gnome-base/gnome gnome-base/gnome
mail-client/evolution mail-client/mozilla-thunderbird
mail-client/mozilla-thunderbird-bin
media-gfx/fbgrab media-gfx/fbgrab
media-sound/audacious media-sound/audacious
net-analyzer/netcat net-analyzer/netcat
@ -86,7 +84,7 @@ livecd/packages:
sys-apps/parted sys-apps/parted
# sys-apps/powerpc-utils # sys-apps/powerpc-utils
sys-apps/sdparm sys-apps/sdparm
sys-apps/sg3_utils # sys-apps/sg3_utils
sys-apps/slocate sys-apps/slocate
sys-apps/smartmontools sys-apps/smartmontools
sys-block/gpart sys-block/gpart
@ -120,7 +118,7 @@ livecd/packages:
sys-power/acpid sys-power/acpid
sys-process/vixie-cron sys-process/vixie-cron
www-client/links www-client/links
www-client/mozilla-firefox-bin www-client/mozilla-firefox
x11-base/xorg-x11 x11-base/xorg-x11
x11-drivers/synaptics x11-drivers/synaptics
x11-misc/xscreensaver x11-misc/xscreensaver

View file

@ -19,7 +19,7 @@ livecd/type: gentoo-release-livecd
livecd/users: gentoo livecd/users: gentoo
livecd/volid: Gentoo Linux 2007.0 x86 LiveCD livecd/volid: Gentoo Linux 2007.0 x86 LiveCD
livecd/overlay: /root/livecd/overlays/livecd/2007.0 livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd
livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/root_overlay: /root/livecd/overlays/root-livecd
livecd/bootargs: dokeymap livecd/bootargs: dokeymap
@ -28,7 +28,7 @@ livecd/gk_mainargs: --lvm2 --dmraid --evms2 --unionfs-dev
boot/kernel: gentoo boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/x86/livecd-2.6.19.config boot/kernel/gentoo/config: /root/livecd/kconfig/2007.0/x86/livecd-2.6.19.config
boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/use: pcmcia usb oss atm
@ -37,8 +37,8 @@ boot/kernel/gentoo/packages:
media-gfx/splash-themes-livecd media-gfx/splash-themes-livecd
media-libs/alsa-lib media-libs/alsa-lib
media-sound/alsa-utils media-sound/alsa-utils
net-dialup/fcdsl # net-dialup/fcdsl
net-dialup/fritzcapi # net-dialup/fritzcapi
net-dialup/globespan-adsl net-dialup/globespan-adsl
net-dialup/slmodem net-dialup/slmodem
net-wireless/acx net-wireless/acx
@ -46,7 +46,7 @@ boot/kernel/gentoo/packages:
net-wireless/ipw3945 net-wireless/ipw3945
net-wireless/madwifi-ng-tools net-wireless/madwifi-ng-tools
net-wireless/rt2500 net-wireless/rt2500
net-wireless/rtl8187 # net-wireless/rtl8187
sys-apps/pcmciautils sys-apps/pcmciautils
sys-fs/cryptsetup-luks sys-fs/cryptsetup-luks

View file

@ -6,7 +6,6 @@ profile: default-linux/x86/2007.0/desktop
snapshot: 2007.0 snapshot: 2007.0
source_subpath: default/stage3-i686-desktop-2007.0 source_subpath: default/stage3-i686-desktop-2007.0
livecd/use: livecd/use:
atm
branding branding
livecd livecd
socks5 socks5
@ -53,7 +52,7 @@ livecd/packages:
app-office/gnucash app-office/gnucash
app-office/gnumeric app-office/gnumeric
app-office/koffice app-office/koffice
app-office/openoffice-bin app-office/openoffice
app-office/scribus app-office/scribus
app-pda/gtkpod app-pda/gtkpod
app-pda/ipodslave app-pda/ipodslave
@ -89,7 +88,7 @@ livecd/packages:
kde-base/kde-meta kde-base/kde-meta
kde-base/kooka kde-base/kooka
mail-client/evolution mail-client/evolution
mail-client/mozilla-thunderbird-bin mail-client/mozilla-thunderbird
mail-client/sylpheed mail-client/sylpheed
mail-client/sylpheed-claws mail-client/sylpheed-claws
media-gfx/blender media-gfx/blender
@ -189,7 +188,7 @@ livecd/packages:
sys-apps/qtparted sys-apps/qtparted
sys-apps/rsbac-admin sys-apps/rsbac-admin
sys-apps/sdparm sys-apps/sdparm
sys-apps/sg3_utils # sys-apps/sg3_utils
sys-apps/slocate sys-apps/slocate
sys-apps/smartmontools sys-apps/smartmontools
sys-apps/suspend2-userui sys-apps/suspend2-userui
@ -235,7 +234,7 @@ livecd/packages:
www-client/epiphany-extensions www-client/epiphany-extensions
www-client/galeon www-client/galeon
www-client/links www-client/links
www-client/mozilla-firefox-bin www-client/mozilla-firefox
www-client/opera www-client/opera
www-client/seamonkey www-client/seamonkey
x11-base/xorg-x11 x11-base/xorg-x11

View file

@ -19,7 +19,7 @@ livecd/type: gentoo-release-livecd
livecd/users: gentoo livecd/users: gentoo
livecd/volid: Gentoo Linux 2007.0 x86 LiveDVD livecd/volid: Gentoo Linux 2007.0 x86 LiveDVD
livecd/overlay: /root/livecd/overlays/livedvd/2007.0 livecd/overlay: /root/livecd/overlays/2007.0/common/overlay/livecd
livecd/root_overlay: /root/livecd/overlays/root-livecd livecd/root_overlay: /root/livecd/overlays/root-livecd
livecd/bootargs: dokeymap livecd/bootargs: dokeymap
@ -28,7 +28,7 @@ livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2 --unionfs-dev
boot/kernel: gentoo boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/x86/livecd-2.6.19.config boot/kernel/gentoo/config: /root/livecd/kconfig/2007.0/x86/livecd-2.6.19.config
boot/kernel/gentoo/use: pcmcia usb oss atm boot/kernel/gentoo/use: pcmcia usb oss atm
@ -38,8 +38,8 @@ boot/kernel/gentoo/packages:
media-gfx/splash-themes-livecd media-gfx/splash-themes-livecd
media-libs/alsa-lib media-libs/alsa-lib
media-sound/alsa-utils media-sound/alsa-utils
net-dialup/fcdsl # net-dialup/fcdsl
net-dialup/fritzcapi # net-dialup/fritzcapi
net-dialup/globespan-adsl net-dialup/globespan-adsl
net-dialup/slmodem net-dialup/slmodem
net-wireless/acx net-wireless/acx
@ -48,7 +48,7 @@ boot/kernel/gentoo/packages:
net-wireless/ipw3945 net-wireless/ipw3945
net-wireless/madwifi-ng-tools net-wireless/madwifi-ng-tools
net-wireless/rt2500 net-wireless/rt2500
net-wireless/rtl8187 # net-wireless/rtl8187
sys-apps/pcmciautils sys-apps/pcmciautils
sys-fs/cryptsetup-luks sys-fs/cryptsetup-luks

View file

@ -7,7 +7,6 @@ snapshot: 2007.0
source_subpath: default/stage3-x86-2007.0 source_subpath: default/stage3-x86-2007.0
livecd/use: livecd/use:
-* -*
atm
fbcon fbcon
ipv6 ipv6
livecd livecd

View file

@ -22,7 +22,7 @@ livecd/gk_mainargs: --lvm2 --dmraid --evms2
boot/kernel: gentoo boot/kernel: gentoo
boot/kernel/gentoo/sources: gentoo-sources boot/kernel/gentoo/sources: gentoo-sources
boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2007.0/x86/installcd-2.6.19.config boot/kernel/gentoo/config: /root/livecd/kconfig/2007.0/x86/installcd-2.6.19.config
boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt -qt3 -qt4 boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt -qt3 -qt4
@ -33,12 +33,12 @@ boot/kernel/gentoo/packages:
net-dialup/slmodem net-dialup/slmodem
net-dialup/globespan-adsl net-dialup/globespan-adsl
net-wireless/hostap-utils net-wireless/hostap-utils
net-dialup/fritzcapi # net-dialup/fritzcapi
net-dialup/fcdsl # net-dialup/fcdsl
sys-fs/cryptsetup-luks sys-fs/cryptsetup-luks
net-wireless/rt2500 net-wireless/rt2500
net-wireless/acx net-wireless/acx
# net-wireless/ipw3945 net-wireless/ipw3945
livecd/unmerge: livecd/unmerge:
# acl # acl