From 3a7d5774f161d05ac9f0b97cdcb5a8c9344e8f1b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 7 Oct 2005 02:22:32 +0000 Subject: [PATCH] Added 2006.0 development profile based on 2005.1. It removes the behavior of always setting ${ABI} and will thus I'm certain will break some things, so please use with caution. also deprecated the 2005.[01]/no-symlinks development profiles. --- .../amd64/2005.0/no-symlinks/deprecated | 4 ++ .../amd64/2005.1/no-symlinks/deprecated | 4 ++ .../default-linux/amd64/2006.0/make.defaults | 30 +++++++++ .../amd64/2006.0/no-multilib/make.defaults | 5 ++ .../amd64/2006.0/no-multilib/package.mask | 64 +++++++++++++++++++ .../amd64/2006.0/no-multilib/parent | 7 ++ .../amd64/2006.0/no-symlinks/README | 11 ++++ .../amd64/2006.0/no-symlinks/make.defaults | 9 +++ .../2006.0/no-symlinks/no-lib32/make.defaults | 5 ++ .../2006.0/no-symlinks/no-lib32/package.mask | 55 ++++++++++++++++ .../amd64/2006.0/no-symlinks/no-lib32/parent | 7 ++ .../amd64/2006.0/no-symlinks/package.mask | 5 ++ .../amd64/2006.0/no-symlinks/parent | 7 ++ .../amd64/2006.0/no-symlinks/profile.bashrc | 17 +++++ .../default-linux/amd64/2006.0/package.mask | 6 ++ profiles/default-linux/amd64/2006.0/packages | 17 +++++ profiles/default-linux/amd64/2006.0/parent | 7 ++ .../default-linux/amd64/2006.0/profile.bashrc | 10 +++ profiles/default-linux/amd64/2006.0/use.mask | 5 ++ profiles/default-linux/amd64/2006.0/virtuals | 6 ++ 20 files changed, 281 insertions(+) create mode 100644 profiles/default-linux/amd64/2005.0/no-symlinks/deprecated create mode 100644 profiles/default-linux/amd64/2005.1/no-symlinks/deprecated create mode 100644 profiles/default-linux/amd64/2006.0/make.defaults create mode 100644 profiles/default-linux/amd64/2006.0/no-multilib/make.defaults create mode 100644 profiles/default-linux/amd64/2006.0/no-multilib/package.mask create mode 100644 profiles/default-linux/amd64/2006.0/no-multilib/parent create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/README create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/parent create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/package.mask create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/parent create mode 100644 profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc create mode 100644 profiles/default-linux/amd64/2006.0/package.mask create mode 100644 profiles/default-linux/amd64/2006.0/packages create mode 100644 profiles/default-linux/amd64/2006.0/parent create mode 100644 profiles/default-linux/amd64/2006.0/profile.bashrc create mode 100644 profiles/default-linux/amd64/2006.0/use.mask create mode 100644 profiles/default-linux/amd64/2006.0/virtuals diff --git a/profiles/default-linux/amd64/2005.0/no-symlinks/deprecated b/profiles/default-linux/amd64/2005.0/no-symlinks/deprecated new file mode 100644 index 000000000000..df4883273359 --- /dev/null +++ b/profiles/default-linux/amd64/2005.0/no-symlinks/deprecated @@ -0,0 +1,4 @@ +default-linux/amd64/2006.0/no-symlinks + +# The 2005.0/no-symlinks profile will be deleted on or after 10/20/2005. +# Please switch to 2006.0/no-symlinks diff --git a/profiles/default-linux/amd64/2005.1/no-symlinks/deprecated b/profiles/default-linux/amd64/2005.1/no-symlinks/deprecated new file mode 100644 index 000000000000..2e1a6e414171 --- /dev/null +++ b/profiles/default-linux/amd64/2005.1/no-symlinks/deprecated @@ -0,0 +1,4 @@ +default-linux/amd64/2006.0/no-symlinks + +# The 2005.1/no-symlinks profile will be deleted on or after 10/20/2005. +# Please switch to 2006.0/no-symlinks diff --git a/profiles/default-linux/amd64/2006.0/make.defaults b/profiles/default-linux/amd64/2006.0/make.defaults new file mode 100644 index 000000000000..d014c6ef5122 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/make.defaults @@ -0,0 +1,30 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +FEATURES="sandbox autoconfig" + +MULTILIB_ABIS="x86 amd64" +DEFAULT_ABI="amd64" + +#CFLAGS_amd64="-m64" +#LDFLAGS_amd64="-m elf_x86_64" +CHOST_amd64="x86_64-pc-linux-gnu" +CDEFINE_amd64="__x86_64__" +LIBDIR_amd64="lib64" + +# Added -L/emul* workaround to aid compilation of 32bit packages +# See bug #88725 for more info - Herbie Hopkins 2005/04/19 +CFLAGS_x86="-m32 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib" +LDFLAGS_x86="-m elf_i386 -L/emul/linux/x86/lib -L/emul/linux/x86/usr/lib" +CHOST_x86="i686-pc-linux-gnu" +CDEFINE_x86="__i386__" +LIBDIR_x86="lib32" + +# In case someone wants to help out by setting FEATURES="multilib-strict" +MULTILIB_STRICT_DIRS="/lib /usr/lib /usr/kde/*/lib /usr/qt/*/lib /usr/X11R6/lib" +MULTILIB_STRICT_DENY="64-bit.*shared object" +MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3)" + +# Hack to tell baselayout to use symlinks for /lib, /usr/lib, and /usr/local/lib +SYMLINK_LIB="yes" diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults b/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults new file mode 100644 index 000000000000..fa1eb681852a --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults @@ -0,0 +1,5 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +MULTILIB_ABIS="amd64" diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/package.mask b/profiles/default-linux/amd64/2006.0/no-multilib/package.mask new file mode 100644 index 000000000000..2e7ba4500132 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-multilib/package.mask @@ -0,0 +1,64 @@ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# Jeremy Huddleston +# Mask multilib amd64 things +app-antivirus/bitdefender-console +app-arch/rar +app-benchmarks/cpuburn +app-cdr/cdrecord-prodvd +app-emulation/cedaga +app-emulation/crossover-office-bin +app-emulation/winex-transgaming +app-office/mozilla-sunbird-bin +app-office/openoffice-bin +app-office/openoffice-ximian-bin +app-emulation/cedega +app-emulation/emul-linux-x86-baselibs +app-emulation/emul-linux-x86-compat +app-emulation/emul-linux-x86-glibc +app-emulation/emul-linux-x86-gtklibs +app-emulation/emul-linux-x86-medialibs +app-emulation/emul-linux-x86-nvidia +app-emulation/emul-linux-x86-qtlibs +app-emulation/emul-linux-x86-sdl +app-emulation/emul-linux-x86-soundlibs +app-emulation/emul-linux-x86-xlibs +app-emulation/transgaming-fontinstaller +app-emulation/transgaming-mozctlinstaller +app-emulation/winex-transgaming +app-emulation/wine +app-emulation/winesetuptk +app-emulation/winex +app-emulation/winex-cvs +app-emulation/winex-transgaming +app-text/acroread +games-emulation/nestra +games-emulation/snes9x +games-emulation/zsnes +games-fps/americas-army +games-fps/doom3-demo +games-fps/doom3 +games-fps/enemy-territory +games-fps/postal2mpdemo +games-fps/quake3 +games-fps/rtcw +games-fps/vendetta-online-bin +games-rpg/nwn +games-rpg/nwn-cep +games-server/nwn-ded +media-libs/win32codecs +media-sound/shoutcast-server-bin +media-sound/shoutcast-trans-bin +media-sound/teamspeak2-client-bin +media-sound/teamspeak2-server-bin +media-sound/ventrilo-server-bin +media-video/mplayer-bin +media-video/realplayer +net-im/skype +net-im/ymessenger +net-www/netscape-flash +sci-biology/foldingathome +sys-boot/grub +www-client/opera +www-client/mozilla-bin +www-client/mozilla-firefox-bin diff --git a/profiles/default-linux/amd64/2006.0/no-multilib/parent b/profiles/default-linux/amd64/2006.0/no-multilib/parent new file mode 100644 index 000000000000..21c85f10c50e --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-multilib/parent @@ -0,0 +1,7 @@ +# Copyright 2004-2005 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-multilib/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# This file describes the parent profile to this. In most cases this will +# just be the name of the parent directory +.. diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/README b/profiles/default-linux/amd64/2006.0/no-symlinks/README new file mode 100644 index 000000000000..ce60ca2be15d --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-symlinks/README @@ -0,0 +1,11 @@ +HOWTO upgrade from 2005.0 to 2005.0/no-symlinks + + 1) emerge -v '>=sys-apps/baselayout-1.11.8-r1' + 2) rm /etc/make.profile + 3) ln -s /usr/portage/profiles/default-linux/amd64/2005.0/no-symlinks /etc/make.profile + 4) lynx -source http://dev.gentoo.org/~eradicator/fix_lib_symlinks.sh | sh + 5) emerge -upv system + 6) emerge -uv system + +Notes: +The script for step 4 isn't yet ready. It's safe to skip for now. diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults b/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults new file mode 100644 index 000000000000..631de6b8ff52 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults @@ -0,0 +1,9 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# Hack to tell baselayout NOT to use symlinks for /lib, /usr/lib, and /usr/local/lib +SYMLINK_LIB="no" + +# Make people test using multilib-strict +FEATURES="multilib-strict" diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults new file mode 100644 index 000000000000..fe1972b365ca --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults @@ -0,0 +1,5 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/make.defaults,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +LIBDIR_x86="lib" diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask new file mode 100644 index 000000000000..9390ac1d8601 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask @@ -0,0 +1,55 @@ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/no-lib32/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# Jeremy Huddleston +# multilib aware versions (install to & look in proper $(get_libdir)) +# +# Make sure the good versions are marked stable before a no-lib32 profile is +# released as a default profile. These masks should remain in until all old +# versions are removed from the tree. + +# default library location is fubared on >2.0.51.x; bug #103818 +>=sys-apps/portage-2.0.52 diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/parent b/profiles/default-linux/amd64/2006.0/no-symlinks/parent new file mode 100644 index 000000000000..536c038bf642 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-symlinks/parent @@ -0,0 +1,7 @@ +# Copyright 2004-2005 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# This file describes the parent profile to this. In most cases this will +# just be the name of the parent directory +.. diff --git a/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc b/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc new file mode 100644 index 000000000000..d7f58c1b4fa0 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc @@ -0,0 +1,17 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/no-symlinks/profile.bashrc,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +for dir in /lib /lib64 /usr/lib /usr/lib64 /usr/X11R6/lib /usr/X11R6/lib64 /usr/qt/*/lib /usr/qt/*/lib64 /usr/kde/*/lib /usr/kde/*/lib64; do + if [ -L "${dir}" ]; then + ewarn "${dir} is a symlink" + #exit 1 + fi +done + +if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then + eerror "The amd64 2005.0/no-symlinks profile is still in active development" + eerror "and not yet ready for user testing. An announcement will be made" + eerror "on gentoo-amd64@gentoo.org once we are ready for testers." + exit 1 +fi diff --git a/profiles/default-linux/amd64/2006.0/package.mask b/profiles/default-linux/amd64/2006.0/package.mask new file mode 100644 index 000000000000..c004249275ed --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/package.mask @@ -0,0 +1,6 @@ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/package.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# Jeremy Huddleston +# These are provided by non-emul packages now +-=app-emulation/emul-linux-x86-glibc-1000 +=sys-devel/binutils-2.15.90.0.1.1-r4 +*>=sys-devel/gcc-3.4.3-r1 + +# Avoid the bad NIS stuff with 2.3.4.20041102 and the ugly ebuilds prior to it +*>=sys-libs/glibc-2.3.5 + +# Use only portages with sandbox split off +*>=sys-apps/portage-2.0.51.22 + +# Make sure toolchain compiler is friendly to multilib based on ${CHOST} +app-admin/eselect-compiler + +*>=sys-apps/baselayout-1.11.13-r1 diff --git a/profiles/default-linux/amd64/2006.0/parent b/profiles/default-linux/amd64/2006.0/parent new file mode 100644 index 000000000000..41ae85a2dadf --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/parent @@ -0,0 +1,7 @@ +# Copyright 2004-2005 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/parent,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# This file describes the parent profile to this. In most cases this will +# just be the name of the parent directory +.. diff --git a/profiles/default-linux/amd64/2006.0/profile.bashrc b/profiles/default-linux/amd64/2006.0/profile.bashrc new file mode 100644 index 000000000000..869c59390cf4 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/profile.bashrc @@ -0,0 +1,10 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/profile.bashrc,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then + eerror "The amd64 2006.0 profile is still in active development and requires" + eerror "some packages still in package.mask or ~amd64 and is not yet ready for user testing." + eerror "An announcement will be made on gentoo-amd64@gentoo.org once we are ready for testers." + exit 1 +fi diff --git a/profiles/default-linux/amd64/2006.0/use.mask b/profiles/default-linux/amd64/2006.0/use.mask new file mode 100644 index 000000000000..5332266f36a4 --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/use.mask @@ -0,0 +1,5 @@ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/use.mask,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +# Jeremy Huddleston +# multilib is forced on when we have ${MULTILIB_ABIS} defined +multilib diff --git a/profiles/default-linux/amd64/2006.0/virtuals b/profiles/default-linux/amd64/2006.0/virtuals new file mode 100644 index 000000000000..a6822aa6bf4b --- /dev/null +++ b/profiles/default-linux/amd64/2006.0/virtuals @@ -0,0 +1,6 @@ +# Copyright 2004 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/virtuals,v 1.1 2005/10/07 02:22:32 eradicator Exp $ + +virtual/alsa media-sound/alsa-drivers +virtual/linux-sources sys-kernel/gentoo-sources -- 2.26.2