From: Mike Frysinger Date: Wed, 22 Dec 2004 02:37:16 +0000 (+0000) Subject: all the x86 make.defaults were exactly the same (ok, there was a difference of about... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24bd67907884d760396b5de3ef5a75c389132e86;p=gentoo.git all the x86 make.defaults were exactly the same (ok, there was a difference of about 4 default USE flags), so lets merge them all into one file :D --- diff --git a/profiles/default-linux/x86/2004.0/make.defaults b/profiles/default-linux/x86/2004.0/make.defaults deleted file mode 100644 index 3138c78cd8ad..000000000000 --- a/profiles/default-linux/x86/2004.0/make.defaults +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.0/make.defaults,v 1.8 2004/11/08 00:22:08 lv Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode foomaticdb fortran f77 gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults deleted file mode 100644 index b09dd8d1e54b..000000000000 --- a/profiles/default-linux/x86/2004.2/gcc34/2.6/make.defaults +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2002-2004 Gentoo Foundation. -# System-wide defaults for the >=gcc 3.2 Portage system - -#Experimental: trying to use these USE variables to build up from stage 2->3 -#thus eliminating the inherent fragility of using USE for this - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" diff --git a/profiles/default-linux/x86/2004.2/gcc34/make.defaults b/profiles/default-linux/x86/2004.2/gcc34/make.defaults deleted file mode 100644 index b09dd8d1e54b..000000000000 --- a/profiles/default-linux/x86/2004.2/gcc34/make.defaults +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2002-2004 Gentoo Foundation. -# System-wide defaults for the >=gcc 3.2 Portage system - -#Experimental: trying to use these USE variables to build up from stage 2->3 -#thus eliminating the inherent fragility of using USE for this - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb crypt cups encode foomaticdb gdbm gif gpm imlib jpeg libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" diff --git a/profiles/default-linux/x86/2004.2/make.defaults b/profiles/default-linux/x86/2004.2/make.defaults deleted file mode 100644 index ddcb8bf166fc..000000000000 --- a/profiles/default-linux/x86/2004.2/make.defaults +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.2/make.defaults,v 1.7 2004/11/08 00:22:08 lv Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/2004.3/make.defaults b/profiles/default-linux/x86/2004.3/make.defaults deleted file mode 100644 index 52ec5b2ee0bd..000000000000 --- a/profiles/default-linux/x86/2004.3/make.defaults +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2004.3/make.defaults,v 1.5 2004/11/08 00:22:08 lv Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/2005.0/make.defaults b/profiles/default-linux/x86/2005.0/make.defaults deleted file mode 100644 index cc364df9296e..000000000000 --- a/profiles/default-linux/x86/2005.0/make.defaults +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/2005.0/make.defaults,v 1.1 2004/12/03 14:37:17 wolf31o2 Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/gcc2/make.defaults b/profiles/default-linux/x86/gcc2/make.defaults deleted file mode 100644 index 22a3bd8a4cc7..000000000000 --- a/profiles/default-linux/x86/gcc2/make.defaults +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc2/make.defaults,v 1.9 2004/11/08 00:22:08 lv Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 gdbm gif gpm gtk imlib java jpeg kde libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/gcc31/make.defaults b/profiles/default-linux/x86/gcc31/make.defaults deleted file mode 100644 index 79e9dfa9af5c..000000000000 --- a/profiles/default-linux/x86/gcc31/make.defaults +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/gcc31/make.defaults,v 1.10 2004/11/08 00:22:08 lv Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -USE="x86 oss apm arts avi berkdb bitmap=fonts crypt cups encode fortran f77 gdbm gif gpm gtk imlib java jpeg kde gnome libg++ libwww mikmod mmx motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/make.defaults b/profiles/default-linux/x86/make.defaults new file mode 100644 index 000000000000..5a85b0db4a9b --- /dev/null +++ b/profiles/default-linux/x86/make.defaults @@ -0,0 +1,66 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/make.defaults,v 1.1 2004/12/22 02:37:16 vapier Exp $ + +GRP_STAGE23_USE=" +acl +berkdb +gpm +ipv6 +ncurses +nls +pam +perl +python +readline +ssl +tcpd +" + +# Please avoid enabling things by default in here if possible. Understand +# any implications with core packages. For example, if "java" is in USE and +# db has a conditional dependency on java (which it does,) then a JDK will be +# pulled in during *emerge system*! + +USE="${GRP_STAGE23_USE} +apm +arts +avi +berkdb +crypt +cups +encode +foomaticdb +fortran +gdbm +gif +gnome gtk gtk2 +gpm +jpeg +kde qt +libwww +mad +mikmod +motif +mpeg +oggvorbis +opengl +pdflib +png +quicktime +oss +sdl +spell +svga +truetype +X +xml2 +xmms +xv +zlib +" + +ARCH="x86" +ACCEPT_KEYWORDS="x86" + +FEATURES="sandbox sfperms" diff --git a/profiles/default-linux/x86/xbox/make.defaults b/profiles/default-linux/x86/xbox/make.defaults index 500c9bece708..7c1c378df1b7 100644 --- a/profiles/default-linux/x86/xbox/make.defaults +++ b/profiles/default-linux/x86/xbox/make.defaults @@ -1,21 +1,5 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.3 2004/11/08 00:22:08 lv Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/xbox/make.defaults,v 1.4 2004/12/22 02:37:16 vapier Exp $ -GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses" - -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups encode fortran f77 foomaticdb gdbm gif gpm gtk gtk2 imlib jpeg kde gnome libg++ libwww mad mikmod motif mpeg ncurses nls oggvorbis opengl pam pdflib png python qt quicktime readline sdl slang spell ssl svga tcpd truetype X xml2 xmms xv zlib" - -ARCH="x86" PROFILE_ARCH="xbox" -ACCEPT_KEYWORDS="x86" - -FEATURES="sandbox sfperms"