package.use.mask files for jdks/jres because not all of them support the nsplugin use flag. Resolves bug #147908.

12 files changed, 59 insertions, 1 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
new file mode 100644
index 000000000000..ec7a5f4ad75c
--- /dev/null
+++ b/profiles/base/package.use.mask
@@ -0,0 +1,6 @@
+# This file requires >=portage-2.1.1
+
+dev-java/sun-jdk nsplugin
+dev-java/sun-jre-bin nsplugin
+dev-java/ibm-jdk-bin nsplugin 
+dev-java/ibm-jre-bin nsplugin
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/package.use.mask b/profiles/default-linux/ppc/2005.1/ppc64/package.use.mask
new file mode 100644
index 000000000000..985342862ade
--- /dev/null
+++ b/profiles/default-linux/ppc/2005.1/ppc64/package.use.mask
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.1
+
+=dev-java/ibm-jdk-bin-1.5* nsplugin 
+=dev-java/ibm-jre-bin-1.5* nsplugin
diff --git a/profiles/default-linux/ppc/package.use.mask b/profiles/default-linux/ppc/package.use.mask
new file mode 100644
index 000000000000..a7f0dc6c8526
--- /dev/null
+++ b/profiles/default-linux/ppc/package.use.mask
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.1
+
+=dev-java/ibm-jdk-bin-1.5* -nsplugin 
+=dev-java/ibm-jre-bin-1.5* -nsplugin
diff --git a/profiles/default-linux/ppc/ppc64/package.use.mask b/profiles/default-linux/ppc/ppc64/package.use.mask
new file mode 100644
index 000000000000..985342862ade
--- /dev/null
+++ b/profiles/default-linux/ppc/ppc64/package.use.mask
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.1
+
+=dev-java/ibm-jdk-bin-1.5* nsplugin 
+=dev-java/ibm-jre-bin-1.5* nsplugin
diff --git a/profiles/default-linux/x86/ChangeLog b/profiles/default-linux/x86/ChangeLog
index 308ba062a7b4..ac3c2ff41b6c 100644
--- a/profiles/default-linux/x86/ChangeLog
+++ b/profiles/default-linux/x86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.31 2006/10/22 13:58:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/ChangeLog,v 1.32 2006/10/22 19:30:49 betelgeuse Exp $
+
+  22 Oct 2006; Petteri Räty <betelgeuse@gentoo.org> +package.use.mask:
+  Added package.use.mask to handle jdk/jre nsplugin use flag that is not
+  available on all arches.
 
   22 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> no-nptl/package.mask:
   Added >=sys-libs/glibc-2.6 to package.mask for no-nptl.
diff --git a/profiles/default-linux/x86/package.use.mask b/profiles/default-linux/x86/package.use.mask
new file mode 100644
index 000000000000..d6a3e1f36c6a
--- /dev/null
+++ b/profiles/default-linux/x86/package.use.mask
@@ -0,0 +1,6 @@
+# This file requires >=portage-2.1.1
+
+dev-java/sun-jdk -nsplugin
+dev-java/sun-jre-bin -nsplugin
+dev-java/ibm-jdk-bin -nsplugin 
+dev-java/ibm-jre-bin -nsplugin
diff --git a/profiles/hardened/ppc/package.use.mask b/profiles/hardened/ppc/package.use.mask
new file mode 100644
index 000000000000..a7f0dc6c8526
--- /dev/null
+++ b/profiles/hardened/ppc/package.use.mask
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.1
+
+=dev-java/ibm-jdk-bin-1.5* -nsplugin 
+=dev-java/ibm-jre-bin-1.5* -nsplugin
diff --git a/profiles/hardened/x86/package.use.mask b/profiles/hardened/x86/package.use.mask
new file mode 100644
index 000000000000..d6a3e1f36c6a
--- /dev/null
+++ b/profiles/hardened/x86/package.use.mask
@@ -0,0 +1,6 @@
+# This file requires >=portage-2.1.1
+
+dev-java/sun-jdk -nsplugin
+dev-java/sun-jre-bin -nsplugin
+dev-java/ibm-jdk-bin -nsplugin 
+dev-java/ibm-jre-bin -nsplugin
diff --git a/profiles/selinux/2005.1/ppc/package.use.mask b/profiles/selinux/2005.1/ppc/package.use.mask
new file mode 100644
index 000000000000..a7f0dc6c8526
--- /dev/null
+++ b/profiles/selinux/2005.1/ppc/package.use.mask
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.1
+
+=dev-java/ibm-jdk-bin-1.5* -nsplugin 
+=dev-java/ibm-jre-bin-1.5* -nsplugin
diff --git a/profiles/selinux/2005.1/x86/package.use.mask b/profiles/selinux/2005.1/x86/package.use.mask
new file mode 100644
index 000000000000..d6a3e1f36c6a
--- /dev/null
+++ b/profiles/selinux/2005.1/x86/package.use.mask
@@ -0,0 +1,6 @@
+# This file requires >=portage-2.1.1
+
+dev-java/sun-jdk -nsplugin
+dev-java/sun-jre-bin -nsplugin
+dev-java/ibm-jdk-bin -nsplugin 
+dev-java/ibm-jre-bin -nsplugin
diff --git a/profiles/uclibc/ppc/package.use.mask b/profiles/uclibc/ppc/package.use.mask
new file mode 100644
index 000000000000..a7f0dc6c8526
--- /dev/null
+++ b/profiles/uclibc/ppc/package.use.mask
@@ -0,0 +1,4 @@
+# This file requires >=portage-2.1.1
+
+=dev-java/ibm-jdk-bin-1.5* -nsplugin 
+=dev-java/ibm-jre-bin-1.5* -nsplugin
diff --git a/profiles/uclibc/x86/package.use.mask b/profiles/uclibc/x86/package.use.mask
new file mode 100644
index 000000000000..d6a3e1f36c6a
--- /dev/null
+++ b/profiles/uclibc/x86/package.use.mask
@@ -0,0 +1,6 @@
+# This file requires >=portage-2.1.1
+
+dev-java/sun-jdk -nsplugin
+dev-java/sun-jre-bin -nsplugin
+dev-java/ibm-jdk-bin -nsplugin 
+dev-java/ibm-jre-bin -nsplugin