09 Aug 2011; Zac Medico <zmedico@gentoo.org> +uclibc/arm/2.4/package.mask,

+uclibc/arm/armeb/2.4/package.mask, +uclibc/ppc/2.4/package.mask,
+uclibc/ppc/hardened/2.4/package.mask, +uclibc/sh/2.4/package.mask,
+uclibc/x86/2.4/package.mask, +uclibc/x86/2005.1/2.4/package.mask,
+uclibc/x86/hardened/2.4/package.mask, -uclibc/arm/2.4/packages,
-uclibc/arm/armeb/2.4/packages, -uclibc/ppc/2.4/packages,
-uclibc/ppc/hardened/2.4/packages, -uclibc/sh/2.4/packages,
-uclibc/x86/2.4/packages, -uclibc/x86/2005.1/2.4/packages,
-uclibc/x86/hardened/2.4/packages, uclibc/package.mask, uclibc/packages:
Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
future versions of sys-apps/portage.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 237bef7b9381fdf3f4b905f94286302738c3296c..d086a2fa102907754aefa4f3ef451a67e726055c 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,23 @@
 # ChangeLog for profile directory
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5604 2011/08/08 11:34:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5605 2011/08/09 02:18:12 zmedico Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  09 Aug 2011; Zac Medico <zmedico@gentoo.org> +uclibc/arm/2.4/package.mask,
+  +uclibc/arm/armeb/2.4/package.mask, +uclibc/ppc/2.4/package.mask,
+  +uclibc/ppc/hardened/2.4/package.mask, +uclibc/sh/2.4/package.mask,
+  +uclibc/x86/2.4/package.mask, +uclibc/x86/2005.1/2.4/package.mask,
+  +uclibc/x86/hardened/2.4/package.mask, -uclibc/arm/2.4/packages,
+  -uclibc/arm/armeb/2.4/packages, -uclibc/ppc/2.4/packages,
+  -uclibc/ppc/hardened/2.4/packages, -uclibc/sh/2.4/packages,
+  -uclibc/x86/2.4/packages, -uclibc/x86/2005.1/2.4/packages,
+  -uclibc/x86/hardened/2.4/packages, uclibc/package.mask, uclibc/packages:
+  Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and
+  future versions of sys-apps/portage.
+
   08 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> package.mask:
   Mask sys-fs/unionfs for removal
 

diff --git a/profiles/uclibc/arm/2.4/package.mask b/profiles/uclibc/arm/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/arm/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/arm/2.4/packages b/profiles/uclibc/arm/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/arm/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/arm/armeb/2.4/package.mask b/profiles/uclibc/arm/armeb/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/arm/armeb/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/arm/armeb/2.4/packages b/profiles/uclibc/arm/armeb/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/arm/armeb/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/package.mask b/profiles/uclibc/package.mask
index 9bc920943e9cc870f4ff11fd30a374db9e0b269e..6f5096e96cd2369be47e2e99ac1d5008696c82ec 100644 (file)
--- a/profiles/uclibc/package.mask
+++ b/profiles/uclibc/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/package.mask,v 1.20 2011/02/08 14:47:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/package.mask,v 1.21 2011/08/09 02:18:12 zmedico Exp $
+
+# glib-2.x requires working locale/iconv which
+# isn't available atm in uclibc
+>=dev-libs/glib-2.5
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (8 Feb 2011)
 #  on behalf of QA team <qa@gentoo.org

diff --git a/profiles/uclibc/packages b/profiles/uclibc/packages
index 63dd1e1bb9215f62cee101842f2e4c3bd29e3d86..07aeb9d242d6a5823b7b987a0081b1f38504975f 100644 (file)
--- a/profiles/uclibc/packages
+++ b/profiles/uclibc/packages
@@ -11,8 +11,4 @@ app-misc/pax-utils
 # added by readline
 -*sys-libs/readline
 
-# glib-2.x requires working locale/iconv which
-# isn't available atm in uclibc
-<dev-libs/glib-2.5
-
 -*sys-apps/hdparm

diff --git a/profiles/uclibc/ppc/2.4/package.mask b/profiles/uclibc/ppc/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/ppc/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/ppc/2.4/packages b/profiles/uclibc/ppc/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/ppc/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/ppc/hardened/2.4/package.mask b/profiles/uclibc/ppc/hardened/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/ppc/hardened/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/ppc/hardened/2.4/packages b/profiles/uclibc/ppc/hardened/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/ppc/hardened/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/sh/2.4/package.mask b/profiles/uclibc/sh/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/sh/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/sh/2.4/packages b/profiles/uclibc/sh/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/sh/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/x86/2.4/package.mask b/profiles/uclibc/x86/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/x86/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/x86/2.4/packages b/profiles/uclibc/x86/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/x86/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/x86/2005.1/2.4/package.mask b/profiles/uclibc/x86/2005.1/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/x86/2005.1/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/x86/2005.1/2.4/packages b/profiles/uclibc/x86/2005.1/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/x86/2005.1/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5

diff --git a/profiles/uclibc/x86/hardened/2.4/package.mask b/profiles/uclibc/x86/hardened/2.4/package.mask
new file mode 100644 (file)
index 0000000..3ac3481
--- /dev/null
+++ b/profiles/uclibc/x86/hardened/2.4/package.mask
@@ -0,0 +1,7 @@
+>=sys-kernel/linux-headers-2.5
+>=sys-kernel/gentoo-sources-2.5
+>=sys-kernel/hardened-sources-2.5
+>=sys-kernel/vanilla-sources-2.5
+>=virtual/linux-sources-2.5
+
+>=virtual/pcmcia-2.5

diff --git a/profiles/uclibc/x86/hardened/2.4/packages b/profiles/uclibc/x86/hardened/2.4/packages
deleted file mode 100644 (file)
index 3acbf30..0000000
--- a/profiles/uclibc/x86/hardened/2.4/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-<sys-kernel/linux-headers-2.5
-<sys-kernel/gentoo-sources-2.5
-<sys-kernel/hardened-sources-2.5
-<sys-kernel/vanilla-sources-2.5
-<virtual/linux-sources-2.5
-
-<virtual/pcmcia-2.5