Removed broken packages, cleanout of basic livecd, changes to kde/gnome package

list. Note that the current kde/gnome spec might give rise to live environments
larger than 700M, which might to be changed later on.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@274 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec b/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec
index 76a9606ea33670653e9de8a8eadf3aae60b63821..b37f280fe70ae1177d903a91765d8acfc87e8c75 100644 (file)
--- a/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec
+++ b/examples/livecd/ppc/ppc-kdegnome-stage1-20040225.spec
@@ -8,11 +8,10 @@ version_stamp: 20040225
 source_subpath: default-ppc-2004.0/stage3-ppc-20040225
 
 livecd/use:
-       pic
        aalib 
        accessibility 
        altivec 
-       alsa 
+       -alsa 
        apache2 
        apm 
        arts 
@@ -92,33 +91,23 @@ livecd/use:
        xmms
        yahoo 
        zlib
-
-
        livecd
 
 livecd/packages:
        DirectFB
-       abiword
        apache
-       aumix
        baselayout
        bootsplash
        ccache
-       ccache
        cdrdao
        cdrtools
        chkrootkit
        cups
        curl
-       curl
-       cvs
        cvs
        dante
-       device-mapper
-       dhcpcd
        dhcpcd
        dialog
-       dialog
        dosfstools
        e2fsprogs
        emacs
@@ -126,7 +115,6 @@ livecd/packages:
        evolution
        fluxbox
        ftp
-       ftp
        gabber
        gaim
        genflags
@@ -134,140 +122,87 @@ livecd/packages:
        gentoolkit
        gimp
        gnome
-       gpart
-       gpm
        gpm
-       gradm
-       gradm2
        gtkpbbuttons
        hdparm
-       hdparm
        hfsplusutils
        hfsutils
-       host
        host 
        hotplug
-       hotplug
-       hwdata-knoppix
-       hwsetup
        iptables
        iputils
-       iputils
-       irssi
        irssi
        jfsutils
        joe
        kde
        kdevelop
        keychain
-       keywhein
        koffice
        kpnadsl4linux
-       kpnadsl4linux
-       kudzu
-       lcrzoex
        less
        libsdl
        links
-       links
-       livecd-tools
-       logrotate
        logrotate
-       lukemftp
-       lynx
        lynx
        lzo
-       lzo 
        mac-fdisk
-       mac-fdisk
-       metalog
        metalog
-       minicom
-       mirrorselect
        mirrorselect
        module-init-tools
        mozilla
-       mozilla-firebird
-       nano
        nano
        netcat
        nfs-utils
-       nfs-utils
        nmap
        openbox
-       openoffice-ximian
+       openoffice-bin
        openssh
-       openssh
-       parted
        parted
-       partimage
-       passook
        passook
        pbbuttonsd
        pciutils
-       pciutils
        pmud
        popt
        powerprefs
        ppc-development-sources
        ppc-sources
        ppp
-       ppp
        pppconfig
-       pppconfig
-       pppoed
        pppoed
        pwgen
        quik
        raidtools
-       raidtools
        rdate
        reiserfsprogs
-       reiserfsprogs
-       rp-pppoe
        rp-pppoe
        rpm2targz
        ruby
        samba
        screen
-       screen
-       speedtouch
        star
        strace
        superadduser
-       sylpheed
        sysklogd
        syslog-ng
        tcl
        tcpdump
        tetex
        tk
-       tsocks
-       ucl
        ucl
-       ufed
        ufed    
        unzip
-       unzip
        usbutils
-       vcron
-       vile
-       vim
        vim
        vixie-cron
-       vixie-cron
        wget
        whois
        wireless-tools
-       xautoconf
        xcdroast
        xchat
-       xchat
        xeasyconf
        xemacs
+       xfce4
        xfree
        xfsprogs
        xmms
        yaboot
-       yaboot
-       zip

diff --git a/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec b/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec
index ce15bffff4048541e7099f4e75794e5f37602a7b..70c08599df84acd68f347a63c4f0339c18879da0 100644 (file)
--- a/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec
+++ b/examples/livecd/ppc/ppc-kdegnome-stage2-20040225.spec
@@ -14,32 +14,32 @@ livecd/cdtar: examples/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2
 
 boot/kernel: G3 G4 G5 G3-SMP G4-SMP G5-SMP
 boot/kernel/G3/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G3/config: /usr/src/linux/.config
+boot/kernel/G3/config: /usr/src/configs/G3
 boot/kernel/G3/use: extlib
 boot/kernel/G3/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3/extraversion: G3
 boot/kernel/G4/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G4/config: /usr/src/linux/.config
+boot/kernel/G4/config: /usr/src/configs/G4
 boot/kernel/G4/use: extlib
 boot/kernel/G4/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4/extraversion: G4
 boot/kernel/G5/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G5/config: /usr/src/linux/.config
+boot/kernel/G5/config: /usr/src/configs/G5
 boot/kernel/G5/use: extlib
 boot/kernel/G5/extraversion: G5
 boot/kernel/G3-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G3-SMP/config: /usr/src/linux/.config
+boot/kernel/G3-SMP/config: /usr/src/configs/G3-SMP
 boot/kernel/G3-SMP/use: extlib
 boot/kernel/G3-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3-SMP/extraversion: G3-SMP
 boot/kernel/G4-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G4-SMP/config: /usr/src/linux/.config
+boot/kernel/G4-SMP/config: /usr/src/configs/G4-SMP
 boot/kernel/G4-SMP/use: extlib
 boot/kernel/G4-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4-SMP/extraversion: G4-SMP
 boot/kernel/G5-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
 boot/kernel/G5-SMP/use: extlib
-boot/kernel/G5-SMP/config: /usr/src/linux/.config
+boot/kernel/G5-SMP/config: /usr/src/configs/G5-SMP
 boot/kernel/G5-SMP/extraversion: G5-SMP
 
 livecd/unmerge:

diff --git a/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec b/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec
index 06246e0435c9a059b143f9d64daefeb5c6f73477..7c85b5de407a63444bdbbffe42f217881ec95df8 100644 (file)
--- a/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec
+++ b/examples/livecd/ppc/ppc-livecd-stage2-20040225.spec
@@ -14,32 +14,32 @@ livecd/cdtar: examples/livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2
 
 boot/kernel: G3 G4 G5 G3-SMP G4-SMP G5-SMP
 boot/kernel/G3/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G3/config: /usr/src/linux/.config
-boot/kernel/G3/packages: >=sys-apps/pcmcia-cs-3.2.7
+boot/kernel/G3/config: /usr/src/configs/G3
 boot/kernel/G3/use: extlib
+boot/kernel/G3/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3/extraversion: G3
 boot/kernel/G4/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G4/config: /usr/src/linux/.config
+boot/kernel/G4/config: /usr/src/configs/G4
 boot/kernel/G4/use: extlib
 boot/kernel/G4/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4/extraversion: G4
 boot/kernel/G5/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G5/config: /usr/src/linux/.config
+boot/kernel/G5/config: /usr/src/configs/G5
 boot/kernel/G5/use: extlib
 boot/kernel/G5/extraversion: G5
 boot/kernel/G3-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G3-SMP/config: /usr/src/linux/.config
-boot/kernel/G3-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
+boot/kernel/G3-SMP/config: /usr/src/configs/G3-SMP
 boot/kernel/G3-SMP/use: extlib
+boot/kernel/G3-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G3-SMP/extraversion: G3-SMP
 boot/kernel/G4-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G4-SMP/config: /usr/src/linux/.config
+boot/kernel/G4-SMP/config: /usr/src/configs/G4-SMP
 boot/kernel/G4-SMP/use: extlib
 boot/kernel/G4-SMP/packages: >=sys-apps/pcmcia-cs-3.2.7
 boot/kernel/G4-SMP/extraversion: G4-SMP
 boot/kernel/G5-SMP/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r2
-boot/kernel/G5-SMP/config: /usr/src/linux/.config
 boot/kernel/G5-SMP/use: extlib
+boot/kernel/G5-SMP/config: /usr/src/configs/G5-SMP
 boot/kernel/G5-SMP/extraversion: G5-SMP
 
 livecd/unmerge: