summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-12 04:06:26 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-12 04:06:26 +0000
commited96e1299689f5bbdcfb80c3ab9915e90ef6e3aa (patch)
treeb4d9e0c7a215b60065c9e15333ee3fc04c0fd950 /profiles
parentDisable C++ checks #74499. (Manifest recommit) (diff)
downloadgentoo-2-ed96e1299689f5bbdcfb80c3ab9915e90ef6e3aa.tar.gz
gentoo-2-ed96e1299689f5bbdcfb80c3ab9915e90ef6e3aa.tar.bz2
gentoo-2-ed96e1299689f5bbdcfb80c3ab9915e90ef6e3aa.zip
Add support for emul-linux-x86-glibc stub file on newer profiles because we can't do package.use magic in profiles. Switch from -dev-sources to -sources in virtuals.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default-linux/amd64/2005.0/README3
-rw-r--r--profiles/default-linux/amd64/2005.0/package.mask5
-rw-r--r--profiles/default-linux/amd64/2005.0/virtuals5
-rw-r--r--profiles/default-linux/amd64/package.mask5
-rw-r--r--profiles/default-linux/amd64/virtuals12
5 files changed, 22 insertions, 8 deletions
diff --git a/profiles/default-linux/amd64/2005.0/README b/profiles/default-linux/amd64/2005.0/README
new file mode 100644
index 000000000000..1e2d99fc1834
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/README
@@ -0,0 +1,3 @@
+1) emerge -v '>=sys-apps/portage-2.0.51-r9'
+1) emerge unmerge app-emulation/emul-linux-x86-glibc
+
diff --git a/profiles/default-linux/amd64/2005.0/package.mask b/profiles/default-linux/amd64/2005.0/package.mask
index cf6f62d08a40..7c72c3edae21 100644
--- a/profiles/default-linux/amd64/2005.0/package.mask
+++ b/profiles/default-linux/amd64/2005.0/package.mask
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.4 2005/01/11 08:57:49 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/package.mask,v 1.5 2005/01/12 04:06:26 eradicator Exp $
# Jeremy Huddleston <eradicator@gentoo.org>
# multilib aware versions (install to / look in proper $(get_libdir))
@@ -39,4 +39,5 @@
# Jeremy Huddleston <eradicator@gentoo.org>
# This is provided by sys-libs/glibc now
-app-emulation/emul-linux-x86-glibc
+-=app-emulation/emul-linux-x86-glibc-1000
+<app-emulation/emul-linux-x86-glibc-1000
diff --git a/profiles/default-linux/amd64/2005.0/virtuals b/profiles/default-linux/amd64/2005.0/virtuals
new file mode 100644
index 000000000000..89c88e7ad75c
--- /dev/null
+++ b/profiles/default-linux/amd64/2005.0/virtuals
@@ -0,0 +1,5 @@
+# Copyright 2004 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2005.0/virtuals,v 1.1 2005/01/12 04:06:26 eradicator Exp $
+
+virtual/alsa media-sound/alsa-drivers
diff --git a/profiles/default-linux/amd64/package.mask b/profiles/default-linux/amd64/package.mask
new file mode 100644
index 000000000000..74151176a859
--- /dev/null
+++ b/profiles/default-linux/amd64/package.mask
@@ -0,0 +1,5 @@
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/package.mask,v 1.1 2005/01/12 04:06:26 eradicator Exp $
+
+# Jeremy Huddleston <eradicator@gentoo.org>
+# This is a stub file 'cause glibc provides 32bit libs on newer profiles
+=app-emulation/emul-linux-x86-glibc-1000
diff --git a/profiles/default-linux/amd64/virtuals b/profiles/default-linux/amd64/virtuals
index 59ae2d0f9bd3..669599fdc337 100644
--- a/profiles/default-linux/amd64/virtuals
+++ b/profiles/default-linux/amd64/virtuals
@@ -1,10 +1,10 @@
# Copyright 2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.13 2004/09/27 14:25:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/virtuals,v 1.14 2005/01/12 04:06:26 eradicator Exp $
-virtual/os-headers sys-kernel/linux26-headers
-virtual/alsa sys-kernel/gentoo-dev-sources
-virtual/kernel sys-kernel/linux26-headers
-virtual/linux-sources sys-kernel/gentoo-dev-sources
+virtual/os-headers sys-kernel/linux-headers
+virtual/alsa sys-kernel/gentoo-sources
+virtual/kernel sys-kernel/linux-headers
+virtual/linux-sources sys-kernel/gentoo-sources
virtual/bootloader sys-boot/grub-static
-virtual/os-headers sys-kernel/linux26-headers
+virtual/os-headers sys-kernel/linux-headers