1 |
Author: jmbsvicetto |
2 |
Date: 2009-08-31 21:01:45 +0000 (Mon, 31 Aug 2009) |
3 |
New Revision: 670 |
4 |
|
5 |
Modified: |
6 |
trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec |
7 |
trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec |
8 |
Log: |
9 |
Updates to i686 spec files from likewhoa. |
10 |
|
11 |
|
12 |
Modified: trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec |
13 |
=================================================================== |
14 |
--- trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec 2009-08-29 19:52:21 UTC (rev 669) |
15 |
+++ trunk/releases/10.0/specs/x86/i686/livedvd-stage1.spec 2009-08-31 21:01:45 UTC (rev 670) |
16 |
@@ -1,11 +1,11 @@ |
17 |
subarch: i686 |
18 |
-version_stamp: installer-10.0 |
19 |
+version_stamp: 10.0 |
20 |
target: livecd-stage1 |
21 |
rel_type: default |
22 |
profile: default/linux/x86/10.0/desktop |
23 |
-snapshot: 20090829 |
24 |
+snapshot: 20090830 |
25 |
source_subpath: default/stage3-i686-desktop-10.0 |
26 |
-portage_confdir: /home/likewhoa/portage |
27 |
+portage_confdir: /var/svnroot/releng/trunk/releases/10.0/portage |
28 |
|
29 |
livecd/use: |
30 |
branding |
31 |
@@ -21,10 +21,8 @@ |
32 |
net-misc/wicd |
33 |
app-admin/eselect-esd |
34 |
app-admin/localepurge |
35 |
- app-admin/paxtest |
36 |
app-admin/sysstat |
37 |
app-admin/usbview |
38 |
- app-antivirus/bitdefender-console |
39 |
app-antivirus/clamav |
40 |
app-arch/afio |
41 |
app-arch/arc |
42 |
@@ -33,7 +31,8 @@ |
43 |
app-arch/dump |
44 |
app-arch/file-roller |
45 |
app-arch/lha |
46 |
- app-arch/lrzip |
47 |
+# keywords. |
48 |
+# app-arch/lrzip |
49 |
app-arch/lzop |
50 |
app-arch/mscompress |
51 |
app-arch/ncompress |
52 |
@@ -54,9 +53,10 @@ |
53 |
app-crypt/johntheripper |
54 |
app-editors/gedit |
55 |
app-editors/hexedit |
56 |
- app-forensics/cmospwd |
57 |
- app-forensics/foremost |
58 |
- app-forensics/magicrescue |
59 |
+# keywords. |
60 |
+# app-forensics/cmospwd |
61 |
+# app-forensics/foremost |
62 |
+# app-forensics/magicrescue |
63 |
app-misc/ckermit |
64 |
app-misc/wipe |
65 |
app-text/a2ps |
66 |
@@ -67,7 +67,6 @@ |
67 |
media-sound/alsa-utils |
68 |
media-sound/aumix |
69 |
media-video/rovclock |
70 |
- net-firewall/guarddog |
71 |
net-ftp/gftp |
72 |
net-im/licq |
73 |
net-im/ysm |
74 |
@@ -92,7 +91,8 @@ |
75 |
x11-libs/gksu |
76 |
x11-libs/vte |
77 |
x11-misc/cairo-clock |
78 |
- x11-misc/grsync |
79 |
+# keywords. |
80 |
+# x11-misc/grsync |
81 |
x11-plugins/pidgin-encryption |
82 |
x11-plugins/pidgin-extprefs |
83 |
x11-terms/xterm |
84 |
@@ -104,10 +104,12 @@ |
85 |
app-benchmarks/tiobench |
86 |
app-crypt/aespipe |
87 |
app-crypt/aesutil |
88 |
- app-crypt/gnupg-pkcs11-scd |
89 |
+# keywords. |
90 |
+# app-crypt/gnupg-pkcs11-scd |
91 |
app-crypt/gpgme |
92 |
app-crypt/hashalot |
93 |
- app-crypt/luks-tools |
94 |
+# keywords. |
95 |
+# app-crypt/luks-tools |
96 |
app-crypt/mcrypt |
97 |
app-crypt/md5deep |
98 |
app-editors/scite |
99 |
@@ -118,15 +120,18 @@ |
100 |
app-admin/hwreport |
101 |
app-arch/cabextract |
102 |
app-arch/cfv |
103 |
- app-arch/lzip |
104 |
+# keywords. |
105 |
+# app-arch/lzip |
106 |
app-arch/lzma-utils |
107 |
app-arch/p7zip |
108 |
app-arch/pbzip2 |
109 |
- app-arch/pigz |
110 |
+# keywords. |
111 |
+# app-arch/pigz |
112 |
app-arch/xarchiver |
113 |
app-arch/zip |
114 |
- app-backup/tob |
115 |
- app-cdr/cdw |
116 |
+# keywords. |
117 |
+# app-backup/tob |
118 |
+# app-cdr/cdw |
119 |
app-cdr/xfburn |
120 |
app-crypt/chntpw |
121 |
app-crypt/pinentry |
122 |
@@ -216,7 +221,7 @@ |
123 |
app-cdr/cdrkit |
124 |
app-cdr/dvd+rw-tools |
125 |
app-cdr/gnomebaker |
126 |
- app-cdr/k3b |
127 |
+ #app-cdr/k3b |
128 |
app-cdr/nrg2iso |
129 |
app-crypt/gnupg |
130 |
app-editors/bluefish |
131 |
@@ -226,8 +231,7 @@ |
132 |
app-editors/xemacs |
133 |
app-forensics/chkrootkit |
134 |
app-laptop/i8kutils |
135 |
-### Can't emerge with profile USE |
136 |
-# app-misc/beagle |
137 |
+ app-misc/beagle |
138 |
app-misc/mc |
139 |
app-misc/pax-utils |
140 |
app-misc/screen |
141 |
@@ -239,7 +243,6 @@ |
142 |
app-office/openoffice-bin |
143 |
app-office/scribus |
144 |
app-pda/gtkpod |
145 |
- app-pda/ipodslave |
146 |
app-portage/genlop |
147 |
app-portage/gentoolkit |
148 |
app-portage/gentoolkit-dev |
149 |
@@ -258,13 +261,11 @@ |
150 |
dev-util/cvs |
151 |
dev-util/git |
152 |
dev-util/indent |
153 |
- dev-util/kdbg |
154 |
dev-util/ltrace |
155 |
dev-util/strace |
156 |
dev-util/subversion |
157 |
dev-util/valgrind |
158 |
gnome-base/gdm |
159 |
- gnome-base/gnome |
160 |
gnome-extra/evolution-exchange |
161 |
gnome-extra/gsynaptics |
162 |
gnome-extra/sensors-applet |
163 |
@@ -273,14 +274,13 @@ |
164 |
mail-client/sylpheed |
165 |
mail-client/claws-mail |
166 |
media-gfx/blender |
167 |
- media-gfx/digikam |
168 |
+ #media-gfx/digikam |
169 |
media-gfx/fbgrab |
170 |
media-gfx/gimp |
171 |
media-gfx/gtkam |
172 |
media-gfx/inkscape |
173 |
media-gfx/xsane |
174 |
-# pulls in mysql, FIX ME |
175 |
-# media-sound/amarok |
176 |
+ media-sound/amarok |
177 |
media-sound/audacious |
178 |
# fails because of expat libs |
179 |
# media-sound/audacity |
180 |
@@ -296,7 +296,7 @@ |
181 |
media-video/ogle-gui |
182 |
media-video/vlc |
183 |
media-video/xine-ui |
184 |
- media-video/kmplayer |
185 |
+ media-video/smplayer |
186 |
net-analyzer/ettercap |
187 |
net-analyzer/netcat |
188 |
net-analyzer/nmap |
189 |
@@ -310,9 +310,7 @@ |
190 |
net-dialup/pptpclient |
191 |
net-dialup/rp-pppoe |
192 |
net-firewall/iptables |
193 |
- net-firewall/kmyfirewall |
194 |
-### Compile failure (bug #146214) |
195 |
-# net-ftp/ncftp |
196 |
+ net-ftp/ncftp |
197 |
net-fs/mount-cifs |
198 |
net-fs/nfs-utils |
199 |
net-fs/samba |
200 |
@@ -357,21 +355,16 @@ |
201 |
sys-apps/eject |
202 |
sys-apps/ethtool |
203 |
sys-apps/fxload |
204 |
- #sys-apps/gli |
205 |
sys-apps/gradm |
206 |
sys-apps/hdparm |
207 |
sys-apps/hwsetup |
208 |
-# sys-apps/ibm-powerpc-utils |
209 |
-# sys-apps/ibm-powerpc-utils-papr |
210 |
sys-apps/iproute2 |
211 |
sys-apps/ivman |
212 |
-# sys-apps/lssbus |
213 |
sys-apps/memtester |
214 |
sys-apps/netplug |
215 |
sys-apps/parted |
216 |
sys-apps/pcsc-lite |
217 |
sys-apps/pmount |
218 |
-# sys-apps/powerpc-utils |
219 |
sys-apps/qtparted |
220 |
sys-apps/sdparm |
221 |
sys-apps/sg3_utils |
222 |
@@ -384,15 +377,10 @@ |
223 |
sys-block/mpt-status |
224 |
sys-block/partimage |
225 |
sys-block/qla-fc-firmware |
226 |
-# sys-boot/aboot |
227 |
-# sys-boot/elilo |
228 |
sys-boot/grub |
229 |
sys-boot/lilo |
230 |
sys-boot/syslinux |
231 |
-# sys-boot/yaboot |
232 |
-# sys-devel/binutils-hppa64 |
233 |
sys-devel/distcc |
234 |
-# sys-devel/gcc-hppa64 |
235 |
sys-devel/gdb |
236 |
sys-fs/dmraid |
237 |
sys-fs/dosfstools |
238 |
@@ -400,11 +388,9 @@ |
239 |
sys-fs/evms |
240 |
sys-fs/hfsplusutils |
241 |
sys-fs/hfsutils |
242 |
-# sys-fs/iprutils |
243 |
sys-fs/jfsutils |
244 |
sys-fs/lsscsi |
245 |
sys-fs/lvm2 |
246 |
-# sys-fs/lvm-user |
247 |
sys-fs/mac-fdisk |
248 |
sys-fs/mdadm |
249 |
sys-fs/ntfsprogs |
250 |
@@ -436,4 +422,5 @@ |
251 |
x11-wm/enlightenment |
252 |
x11-wm/fluxbox |
253 |
x11-wm/windowmaker |
254 |
+ x11-wm/openbox |
255 |
xfce-base/xfce4-meta |
256 |
|
257 |
Modified: trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec |
258 |
=================================================================== |
259 |
--- trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec 2009-08-29 19:52:21 UTC (rev 669) |
260 |
+++ trunk/releases/10.0/specs/x86/i686/livedvd-stage2.spec 2009-08-31 21:01:45 UTC (rev 670) |
261 |
@@ -4,15 +4,14 @@ |
262 |
rel_type: default |
263 |
profile: default/linux/x86/10.0/desktop |
264 |
snapshot: 20090829 |
265 |
-source_subpath: default/livecd-stage1-i686-installer-10.0 |
266 |
+source_subpath: default/livecd-stage1-i686-10.0 |
267 |
|
268 |
livecd/bootargs: dokeymap |
269 |
livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 |
270 |
-#livecd/fsscript: /home/agaffney/release/10.0/scripts/livecd.sh |
271 |
livecd/fstype: squashfs |
272 |
-livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j8 |
273 |
-livecd/iso: /var/tmp/catalyst/builds/default/livedvd-i686-installer-10.0.iso |
274 |
-livecd/type: gentoo-release-livecd |
275 |
+livecd/gk_mainargs: --lvm --dmraid --evms --mdadm --makeopts=-j10 |
276 |
+livecd/iso: /var/tmp/catalyst/builds/default/livedvd-i686-10.0.iso |
277 |
+livecd/type: gentoo-release-livedvd |
278 |
livecd/volid: Gentoo Linux 10.0 x86 LiveDVD |
279 |
livecd/xdm: gdm |
280 |
livecd/xsession: gnome |
281 |
@@ -63,7 +62,7 @@ |
282 |
|
283 |
livecd/unmerge: |
284 |
sys-kernel/gentoo-sources |
285 |
- |
286 |
+ |
287 |
livecd/empty: |
288 |
/var/tmp |
289 |
/var/empty |