Adding metadata

64 files changed, 64 insertions, 64 deletions

diff --git a/dev-java/ant-antlr/metadata.xml b/dev-java/ant-antlr/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-antlr/metadata.xml
+++ b/dev-java/ant-antlr/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-bcel/metadata.xml b/dev-java/ant-apache-bcel/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-bcel/metadata.xml
+++ b/dev-java/ant-apache-bcel/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-bsf/metadata.xml b/dev-java/ant-apache-bsf/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-bsf/metadata.xml
+++ b/dev-java/ant-apache-bsf/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-log4j/metadata.xml b/dev-java/ant-apache-log4j/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-log4j/metadata.xml
+++ b/dev-java/ant-apache-log4j/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-oro/metadata.xml b/dev-java/ant-apache-oro/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-oro/metadata.xml
+++ b/dev-java/ant-apache-oro/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-regexp/metadata.xml b/dev-java/ant-apache-regexp/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-regexp/metadata.xml
+++ b/dev-java/ant-apache-regexp/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-resolver/metadata.xml b/dev-java/ant-apache-resolver/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-resolver/metadata.xml
+++ b/dev-java/ant-apache-resolver/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-apache-xalan2/metadata.xml b/dev-java/ant-apache-xalan2/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-apache-xalan2/metadata.xml
+++ b/dev-java/ant-apache-xalan2/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-commons-logging/metadata.xml b/dev-java/ant-commons-logging/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-commons-logging/metadata.xml
+++ b/dev-java/ant-commons-logging/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-commons-net/metadata.xml b/dev-java/ant-commons-net/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-commons-net/metadata.xml
+++ b/dev-java/ant-commons-net/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-core/metadata.xml b/dev-java/ant-core/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-core/metadata.xml
+++ b/dev-java/ant-core/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-jai/metadata.xml b/dev-java/ant-jai/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-jai/metadata.xml
+++ b/dev-java/ant-jai/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-javamail/metadata.xml b/dev-java/ant-javamail/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-javamail/metadata.xml
+++ b/dev-java/ant-javamail/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-jdepend/metadata.xml b/dev-java/ant-jdepend/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-jdepend/metadata.xml
+++ b/dev-java/ant-jdepend/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-jmf/metadata.xml b/dev-java/ant-jmf/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-jmf/metadata.xml
+++ b/dev-java/ant-jmf/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-jsch/metadata.xml b/dev-java/ant-jsch/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-jsch/metadata.xml
+++ b/dev-java/ant-jsch/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-junit/metadata.xml b/dev-java/ant-junit/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-junit/metadata.xml
+++ b/dev-java/ant-junit/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-junit4/metadata.xml b/dev-java/ant-junit4/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-junit4/metadata.xml
+++ b/dev-java/ant-junit4/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-junitlauncher/metadata.xml b/dev-java/ant-junitlauncher/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-junitlauncher/metadata.xml
+++ b/dev-java/ant-junitlauncher/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-swing/metadata.xml b/dev-java/ant-swing/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-swing/metadata.xml
+++ b/dev-java/ant-swing/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-testutil/metadata.xml b/dev-java/ant-testutil/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-testutil/metadata.xml
+++ b/dev-java/ant-testutil/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant-xz/metadata.xml b/dev-java/ant-xz/metadata.xml
index 576b28d53bb9..df41404b7125 100644
--- a/dev-java/ant-xz/metadata.xml
+++ b/dev-java/ant-xz/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/ant/metadata.xml b/dev-java/ant/metadata.xml
index 586b9f634b7b..f652dfdd6abf 100644
--- a/dev-java/ant/metadata.xml
+++ b/dev-java/ant/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:ant</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:ant</remote-id>
  </upstream>
  <use>
   <flag name="antlr">Enable ANTLR Ant tasks</flag>
diff --git a/dev-java/batik/metadata.xml b/dev-java/batik/metadata.xml
index 6ade07440a8b..33e5a0b4a937 100644
--- a/dev-java/batik/metadata.xml
+++ b/dev-java/batik/metadata.xml
@@ -11,7 +11,7 @@
 	purposes, such as viewing, generation or manipulation.
 </longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:batik</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:batik</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/bcmail/metadata.xml b/dev-java/bcmail/metadata.xml
index 4a0d46e7fb40..c3fcee037cc4 100644
--- a/dev-java/bcmail/metadata.xml
+++ b/dev-java/bcmail/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/bcpg/metadata.xml b/dev-java/bcpg/metadata.xml
index 4a0d46e7fb40..c3fcee037cc4 100644
--- a/dev-java/bcpg/metadata.xml
+++ b/dev-java/bcpg/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/bcpkix/metadata.xml b/dev-java/bcpkix/metadata.xml
index 4a0d46e7fb40..c3fcee037cc4 100644
--- a/dev-java/bcpkix/metadata.xml
+++ b/dev-java/bcpkix/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/bcprov/metadata.xml b/dev-java/bcprov/metadata.xml
index 4a0d46e7fb40..c3fcee037cc4 100644
--- a/dev-java/bcprov/metadata.xml
+++ b/dev-java/bcprov/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/bctsp/metadata.xml b/dev-java/bctsp/metadata.xml
index 4a0d46e7fb40..c3fcee037cc4 100644
--- a/dev-java/bctsp/metadata.xml
+++ b/dev-java/bctsp/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:bouncycastle:legion-of-the-bouncy-castle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/c3p0/metadata.xml b/dev-java/c3p0/metadata.xml
index 51144808e91e..610df3614272 100644
--- a/dev-java/c3p0/metadata.xml
+++ b/dev-java/c3p0/metadata.xml
@@ -7,7 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="sourceforge">c3p0</remote-id>
-  <remote-id type="cpe">cpe:/a:mchange:c3p0</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:mchange:c3p0</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/commons-beanutils/metadata.xml b/dev-java/commons-beanutils/metadata.xml
index 60dec0a16d6e..897ff10beff7 100644
--- a/dev-java/commons-beanutils/metadata.xml
+++ b/dev-java/commons-beanutils/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:commons_beanutils</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:commons_beanutils</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/commons-collections/metadata.xml b/dev-java/commons-collections/metadata.xml
index eb110efeb20b..e46ee41950d9 100644
--- a/dev-java/commons-collections/metadata.xml
+++ b/dev-java/commons-collections/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:commons_collections</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:commons_collections</remote-id>
  </upstream>
  <use>
   <flag name="test-framework">Install the test framework</flag>
diff --git a/dev-java/commons-compress/metadata.xml b/dev-java/commons-compress/metadata.xml
index 454e8675515b..c4ae5d80679a 100644
--- a/dev-java/commons-compress/metadata.xml
+++ b/dev-java/commons-compress/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:commons-compress</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:commons-compress</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/commons-configuration/metadata.xml b/dev-java/commons-configuration/metadata.xml
index ee5fffcf5036..4da108e7c4e5 100644
--- a/dev-java/commons-configuration/metadata.xml
+++ b/dev-java/commons-configuration/metadata.xml
@@ -11,7 +11,7 @@
 		a variety of sources.
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:commons_configuration</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:commons_configuration</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/commons-fileupload/metadata.xml b/dev-java/commons-fileupload/metadata.xml
index 7cea1351118f..d7d3972aabf2 100644
--- a/dev-java/commons-fileupload/metadata.xml
+++ b/dev-java/commons-fileupload/metadata.xml
@@ -17,7 +17,7 @@
 		manner easily used by the caller.
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:commons_fileupload</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:commons_fileupload</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/commons-imaging/metadata.xml b/dev-java/commons-imaging/metadata.xml
index 0839614963bf..48c444ca08f0 100644
--- a/dev-java/commons-imaging/metadata.xml
+++ b/dev-java/commons-imaging/metadata.xml
@@ -12,7 +12,7 @@ This library is pure Java. Compared to typical image I/O libraries in native cod
 Imaging was working and was used by a number of projects in production even before version 1.0.</longdescription>
  <upstream>
   <remote-id type="github">apache/commons-imaging</remote-id>
-  <remote-id type="cpe">cpe:/a:apache:commons_imaging</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:commons_imaging</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index fe6349076c64..c07e81d0df30 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -12,7 +12,7 @@
 	</longdescription>
  <upstream>
   <remote-id type="sourceforge">dom4j</remote-id>
-  <remote-id type="cpe">cpe:/a:dom4j_project:dom4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:dom4j_project:dom4j</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
index 5c557b12a370..cd6c5809b2c5 100644
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@@ -13,7 +13,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:gradle:gradle</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:gradle:gradle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml
index 2df152587215..6af0d6de67e0 100644
--- a/dev-java/guava/metadata.xml
+++ b/dev-java/guava/metadata.xml
@@ -8,7 +8,7 @@
  <longdescription lang="en">The Guava project contains several of Google's core libraries that we rely on in our Java-based projects: collections, caching, primitives support, concurrency libraries, common annotations, string processing, I/O, and so forth.</longdescription>
  <upstream>
   <remote-id type="github">google/guava</remote-id>
-  <remote-id type="cpe">cpe:/a:google:guava</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:google:guava</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index d6f4708d800d..832c5980ae05 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -10,7 +10,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:redhat:icedtea</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:redhat:icedtea</remote-id>
  </upstream>
  <use>
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index f5c0b9889ae0..f64c5dd706ef 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -21,7 +21,7 @@
 		The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software 	build tools along with additional tools such as a browser plugin and Web Start support via NetX.
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:redhat:icedtea</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:redhat:icedtea</remote-id>
  </upstream>
  <use>
   <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag>
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml
index 279418dbc2c7..1def18cf8344 100644
--- a/dev-java/jdbc-mysql/metadata.xml
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:oracle:mysql_connector\/j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:oracle:mysql_connector\/j</remote-id>
  </upstream>
  <use>
   <flag name="c3p0">Enable c3p0 support</flag>
diff --git a/dev-java/jdbc-postgresql/metadata.xml b/dev-java/jdbc-postgresql/metadata.xml
index 27a45116d3b2..2d918550d8b6 100644
--- a/dev-java/jdbc-postgresql/metadata.xml
+++ b/dev-java/jdbc-postgresql/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:postgresql:postgresql_jdbc_driver</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:postgresql:postgresql_jdbc_driver</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index c56fd64827f1..0b065432a36b 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -8,7 +8,7 @@
  <upstream>
   <remote-id type="github">junit-team/junit4</remote-id>
   <remote-id type="sourceforge">junit</remote-id>
-  <remote-id type="cpe">cpe:/a:junit:junit4</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:junit:junit4</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index c8478138eaa4..d1193be5a150 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -7,7 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="sourceforge">jython</remote-id>
-  <remote-id type="cpe">cpe:/a:jython_project:jython</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:jython_project:jython</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/log4j/metadata.xml b/dev-java/log4j/metadata.xml
index 12c93b838d73..89d13b29f333 100644
--- a/dev-java/log4j/metadata.xml
+++ b/dev-java/log4j/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:log4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:log4j</remote-id>
  </upstream>
  <use>
   <flag name="javamail">Build the SMTPAppender</flag>
diff --git a/dev-java/mojarra/metadata.xml b/dev-java/mojarra/metadata.xml
index 08a6a3695b81..c0b293d13fcf 100644
--- a/dev-java/mojarra/metadata.xml
+++ b/dev-java/mojarra/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:eclipse:mojarra</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:eclipse:mojarra</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 5bc962ea1220..69fe7cb916ed 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -15,7 +15,7 @@
 		AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:sun:openjdk</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:sun:openjdk</remote-id>
  </upstream>
  <use>
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index f092d4c46b6e..5d157782456f 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -14,7 +14,7 @@
 		The code for Java is open source and available at OpenJDK™.
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:sun:openjdk</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:sun:openjdk</remote-id>
  </upstream>
  <use>
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
index 4c73d934187a..71b0a780bc95 100644
--- a/dev-java/pdfbox/metadata.xml
+++ b/dev-java/pdfbox/metadata.xml
@@ -10,7 +10,7 @@
 	</longdescription>
  <upstream>
   <remote-id type="github">apache/pdfbox</remote-id>
-  <remote-id type="cpe">cpe:/a:apache:pdfbox</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:pdfbox</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-api/metadata.xml b/dev-java/slf4j-api/metadata.xml
index fc147d3a4dd2..1ca56966d810 100644
--- a/dev-java/slf4j-api/metadata.xml
+++ b/dev-java/slf4j-api/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:qos:slf4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:qos:slf4j</remote-id>
   <bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to>
   <doc>http://www.slf4j.org/docs.html</doc>
  </upstream>
diff --git a/dev-java/slf4j-ext/metadata.xml b/dev-java/slf4j-ext/metadata.xml
index 386d48d3746f..5e5e240cefcb 100644
--- a/dev-java/slf4j-ext/metadata.xml
+++ b/dev-java/slf4j-ext/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:qos:slf4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:qos:slf4j</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-log4j12/metadata.xml b/dev-java/slf4j-log4j12/metadata.xml
index 386d48d3746f..5e5e240cefcb 100644
--- a/dev-java/slf4j-log4j12/metadata.xml
+++ b/dev-java/slf4j-log4j12/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:qos:slf4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:qos:slf4j</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-nop/metadata.xml b/dev-java/slf4j-nop/metadata.xml
index 386d48d3746f..5e5e240cefcb 100644
--- a/dev-java/slf4j-nop/metadata.xml
+++ b/dev-java/slf4j-nop/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:qos:slf4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:qos:slf4j</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/slf4j-simple/metadata.xml b/dev-java/slf4j-simple/metadata.xml
index fc147d3a4dd2..1ca56966d810 100644
--- a/dev-java/slf4j-simple/metadata.xml
+++ b/dev-java/slf4j-simple/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:qos:slf4j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:qos:slf4j</remote-id>
   <bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to>
   <doc>http://www.slf4j.org/docs.html</doc>
  </upstream>
diff --git a/dev-java/snakeyaml/metadata.xml b/dev-java/snakeyaml/metadata.xml
index 43a9322184d3..7dafd9c9192f 100644
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@@ -7,7 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="bitbucket">asomov/snakeyaml</remote-id>
-  <remote-id type="cpe">cpe:/a:snakeyaml_project:snakeyaml</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:snakeyaml_project:snakeyaml</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/tapestry/metadata.xml b/dev-java/tapestry/metadata.xml
index 4bf89c0bf1a1..d0c5fe027516 100644
--- a/dev-java/tapestry/metadata.xml
+++ b/dev-java/tapestry/metadata.xml
@@ -13,7 +13,7 @@ Tapestry reconceptualizes web application development in terms of objects, metho
 Tapestry is an alternative to scripting environments such as JavaServer Pages or Velocity. Tapestry goes far further, providing a complete framework for creating extremely dynamic applications with minimal amounts of coding.
 </longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:tapestry</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:tapestry</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
index fd6759b4683c..ebb2c4cd6acf 100644
--- a/dev-java/tomcat-native/metadata.xml
+++ b/dev-java/tomcat-native/metadata.xml
@@ -16,7 +16,7 @@
 		memory, NT pipes and Unix sockets).
 	</longdescription>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:tomcat_native</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:tomcat_native</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/tomcat-servlet-api/metadata.xml b/dev-java/tomcat-servlet-api/metadata.xml
index ef0d5115d510..70fe9c5e6264 100644
--- a/dev-java/tomcat-servlet-api/metadata.xml
+++ b/dev-java/tomcat-servlet-api/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:tomcat</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:tomcat</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
index 30dd1169f097..0fe66e0cf512 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
index 9d54d656a065..78826ac93f9a 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.64.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
index 5b8c94f2e0c3..befa33b38ca2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.44.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xerces/metadata.xml b/dev-java/xerces/metadata.xml
index 49cdfe9682e8..91fa1fba5d51 100644
--- a/dev-java/xerces/metadata.xml
+++ b/dev-java/xerces/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:xerces-j</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:xerces-j</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/xmlgraphics-commons/metadata.xml b/dev-java/xmlgraphics-commons/metadata.xml
index e5ab0f1372ad..47b38ab2594a 100644
--- a/dev-java/xmlgraphics-commons/metadata.xml
+++ b/dev-java/xmlgraphics-commons/metadata.xml
@@ -6,7 +6,7 @@
   <name>Java</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:apache:xmlgraphics_commons</remote-id>
+  <remote-id type="cpe">cpe:2.3:a:apache:xmlgraphics_commons</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file