diff options
| author |   Maarten Thibaut <murphy@gentoo.org> | 2002-08-19 01:04:25 +0000 |
|---|---|---|
| committer | Maarten Thibaut <murphy@gentoo.org> | 2002-08-19 01:04:25 +0000 |
| commit | af9bdcc0ad3356b36f682e4587671e19f929599f (patch) | |
| tree | 6d09bbae4bb2ae5d2dce2e58b9edb1d0349db1aa | |
| parent | Fixes #6338. Compile Problem (diff) | |
| download | gentoo-2-af9bdcc0ad3356b36f682e4587671e19f929599f.tar.gz gentoo-2-af9bdcc0ad3356b36f682e4587671e19f929599f.tar.bz2 gentoo-2-af9bdcc0ad3356b36f682e4587671e19f929599f.zip | |
Merging in changes from main x86 tree
| -rw-r--r-- | profiles/default-sparc64-2.0/make.defaults | 8 | ||||
| -rw-r--r-- | profiles/default-sparc64-2.0/packages | 12 | ||||
| -rw-r--r-- | profiles/default-sparc64-2.0/packages.build | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/profiles/default-sparc64-2.0/make.defaults b/profiles/default-sparc64-2.0/make.defaults index 70c45c0fe258..f0c45870298e 100644 --- a/profiles/default-sparc64-2.0/make.defaults +++ b/profiles/default-sparc64-2.0/make.defaults @@ -1,4 +1,4 @@ -# This file generated automatically at Sun Aug 18 22:59:25 CEST 2002 +# This file generated automatically at Mon Aug 19 03:02:36 CEST 2002 # # Copyright 2002 Gentoo Technologies, Inc. # System-wide defaults for the gcc 3.2 Portage system @@ -12,11 +12,11 @@ svga tcpd truetype X xml2 xmms xv zlib" COMPILER="gcc3" # -# $Id: make.defaults,v 1.5 2002/08/18 21:00:21 murphy Exp $ +# $Id: make.defaults,v 1.6 2002/08/19 01:04:25 murphy Exp $ # # $Log: make.defaults,v $ -# Revision 1.5 2002/08/18 21:00:21 murphy -# Adding in changes from default-x86-2.0 tree +# Revision 1.6 2002/08/19 01:04:25 murphy +# Merging in changes from main x86 tree # # Revision 1.1 2002/08/14 15:56:36 murphy # New alpha version diff --git a/profiles/default-sparc64-2.0/packages b/profiles/default-sparc64-2.0/packages index 74687d285712..674137215314 100644 --- a/profiles/default-sparc64-2.0/packages +++ b/profiles/default-sparc64-2.0/packages @@ -1,4 +1,4 @@ -# This file generated automatically at Sun Aug 18 22:59:25 CEST 2002 +# This file generated automatically at Mon Aug 19 03:02:36 CEST 2002 # # IMPORTANT: In order to parse this new format, you need Portage 1.6 or later! @@ -35,7 +35,7 @@ !dev-lang/gpc *>=sys-apps/baselayout-1.7.9-r1 -*>=sys-apps/portage-2.0.13 +*>=sys-apps/portage-2.0.25 *~sys-devel/binutils-2.13.90.0.4 *>=sys-devel/gcc-3.2 *=sys-libs/glibc-2.2.5-r7 @@ -43,17 +43,15 @@ >=sys-apps/sysklogd-1.4.1 *dev-lang/python ->=x11-base/xfree-4.1.0-r12 +>=x11-base/xfree-4.1.0-r12 # sash - static shell for system recovery *app-shells/sash - *sys-devel/perl *app-editors/nano #no real cost for nano, since we already have ncurses *net-ftp/ftp *net-misc/dhcpcd -*net-misc/netkit-telnetd *net-misc/rsync *net-misc/wget *sys-apps/bash @@ -83,8 +81,6 @@ *sys-apps/netkit-base *sys-apps/procps *sys-apps/psmisc -*sys-apps/raidtools -*sys-apps/reiserfsprogs #sys-apps/sed *sys-apps/setserial *sys-apps/sh-utils @@ -118,7 +114,7 @@ *sys-libs/zlib *net-misc/openssh *sys-apps/devfsd -# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2.0/packages,v 1.6 2002/08/18 21:05:38 verwilst Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2.0/packages,v 1.7 2002/08/19 01:04:25 murphy Exp $ # # Please edit the file packages.sparc, it will be included in # packages the next time you run generate-packages.sh diff --git a/profiles/default-sparc64-2.0/packages.build b/profiles/default-sparc64-2.0/packages.build index 3a82aa4bf005..2e57c0021cd6 100644 --- a/profiles/default-sparc64-2.0/packages.build +++ b/profiles/default-sparc64-2.0/packages.build @@ -1,4 +1,4 @@ -# This file generated automatically at Sun Aug 18 22:59:25 CEST 2002 +# This file generated automatically at Mon Aug 19 03:02:36 CEST 2002 # sys-apps/baselayout sys-libs/glibc |