Add Common Platform Enumeration identifiers

BUG=none
TEST=equery m -U $pkg for each of the packages

Change-Id: I6ff3d44755c3bc78ed5aa1956fed85b503bfaf5a
Reviewed-on: https://gerrit.chromium.org/gerrit/57621
Commit-Queue: Jim Hebert <jimhebert@chromium.org>
Tested-by: Jim Hebert <jimhebert@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 828e59e..d9af583 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -11,4 +11,7 @@
     <flag name="relp">Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
     <flag name="zeromq">Add support for the ZeroMQ input and output plugins using <pkg>net-libs/zeromq</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index ecd156e..cde8a92 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -13,4 +13,7 @@
       Let sudo print insults when the user types the wrong password.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-arch/bzip2/metadata.xml b/app-arch/bzip2/metadata.xml
index 96a2d58..80408f4 100644
--- a/app-arch/bzip2/metadata.xml
+++ b/app-arch/bzip2/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:bzip:bzip2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
index f8ea417..630ce45 100644
--- a/app-arch/gzip/metadata.xml
+++ b/app-arch/gzip/metadata.xml
@@ -5,4 +5,7 @@
 <use>
 <flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 </use>
+<upstream>
+<remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/sharutils/metadata.xml b/app-arch/sharutils/metadata.xml
index 96a2d58..801bcd0 100644
--- a/app-arch/sharutils/metadata.xml
+++ b/app-arch/sharutils/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:gnu:sharutils</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
index 455b61e..f8de3a9 100644
--- a/app-arch/tar/metadata.xml
+++ b/app-arch/tar/metadata.xml
@@ -5,4 +5,7 @@
 <use>
 	<flag name='minimal'>just install `tar`</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:tar</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index 96a2d58..0ae854f 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:rarlab:unrar</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index 46400a3..53f1145 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@@ -7,4 +7,7 @@
   <flag name='X'>Link console vim against X11 libraries to enable title and
 	  clipboard features in xterm</flag>
 </use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:vim:vim</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 23e4a90..8598dc9 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -10,4 +10,7 @@
   <flag name='plugins'>Add support for loading builtins at runtime via
     'enable'</flag>
 </use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
index 659da0c..54de097 100644
--- a/app-shells/dash/metadata.xml
+++ b/app-shells/dash/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/atk/metadata.xml b/dev-libs/atk/metadata.xml
index d9f21e6..70a0dc2 100644
--- a/dev-libs/atk/metadata.xml
+++ b/dev-libs/atk/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome-accessibility</herd>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnome:at-spi2-atk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/dbus-glib/metadata.xml b/dev-libs/dbus-glib/metadata.xml
index 9879e83..1e26d76 100644
--- a/dev-libs/dbus-glib/metadata.xml
+++ b/dev-libs/dbus-glib/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:freedesktop:dbus-glib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/expat/metadata.xml b/dev-libs/expat/metadata.xml
index 2953eb8..cc621dd 100644
--- a/dev-libs/expat/metadata.xml
+++ b/dev-libs/expat/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>freedesktop</herd>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:libexpat:expat</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index 7224311..ae970d3 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -8,4 +8,7 @@
 	<flag name="utils">Install gtester-report utility to generate test
 		report files for your software.</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 52363bf..859c938 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -5,4 +5,7 @@
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libpcre/metadata.xml b/dev-libs/libpcre/metadata.xml
index 56495e4..017b1ad 100644
--- a/dev-libs/libpcre/metadata.xml
+++ b/dev-libs/libpcre/metadata.xml
@@ -27,4 +27,7 @@
       gzip-compressed files, through <pkg>app-arch/gzip</pkg>.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
index 9fbd294..57a49ce 100644
--- a/media-libs/alsa-lib/metadata.xml
+++ b/media-libs/alsa-lib/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="alisp">Enable support for ALISP (ALSA LISP) interpreter for advanced features.</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/o:alsa:alsa-lib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
index e1774e3..d499064 100644
--- a/media-libs/speex/metadata.xml
+++ b/media-libs/speex/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-dns/c-ares/metadata.xml b/net-dns/c-ares/metadata.xml
index 950fed5..8768298 100644
--- a/net-dns/c-ares/metadata.xml
+++ b/net-dns/c-ares/metadata.xml
@@ -6,4 +6,7 @@
   <name>Anthony G. Basile</name>
 </maintainer>
 <longdescription></longdescription>
+<upstream>
+  <remote-id type="cpe">cpe:/a:daniel_stenberg:c-ares</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 789a0be..9c89911 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -6,4 +6,7 @@
  <flag name='ntlm'>Enable support for NTLM (Windows-based) authorization</flag>
  <flag name='uuid'>Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
 </use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:gnu:wget</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index 8eda6f1..2dc91f5 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/metadata.xml
@@ -7,4 +7,7 @@
 		add support for NFS acls
 	</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:xfs:acl</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index 96a2d58..009184e 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
index 659da0c..b122af8 100644
--- a/sys-apps/findutils/metadata.xml
+++ b/sys-apps/findutils/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
index 96a2d58..c9e2840 100644
--- a/sys-apps/grep/metadata.xml
+++ b/sys-apps/grep/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:gnu:grep</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 38a484a..b978e1d 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -16,4 +16,7 @@
 		and wall/write as setgid so non-root users can notify other users
 	</flag>
 </use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 96a2d58..0abb95a 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-fs/ecryptfs-utils/metadata.xml b/sys-fs/ecryptfs-utils/metadata.xml
index 99766b9..0a484b9 100644
--- a/sys-fs/ecryptfs-utils/metadata.xml
+++ b/sys-fs/ecryptfs-utils/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name='pkcs11'>Enable PKCS#11 (Smartcards) key module</flag>
 		<flag name='tpm'>Enable support for Trusted Platform Module (TPM) using <pkg>app-crypt/trousers</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:ecryptfs:ecryptfs_utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 62eb343..186b303 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -20,4 +20,7 @@
 		<flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag>
 		<flag name='thin'>Support for thin volumes</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index e5b58f5..4ee5aec 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -26,4 +26,7 @@
       files.
     </flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:kernel:linux-pam</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
index 600525c..b2dbe04 100644
--- a/sys-libs/zlib/metadata.xml
+++ b/sys-libs/zlib/metadata.xml
@@ -5,4 +5,7 @@
 	<use>
 		<flag name="minizip">include the minizip library for quick and dirty zip extraction</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:zlib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-apps/xinput/metadata.xml b/x11-apps/xinput/metadata.xml
index 6cc3982..962587d 100644
--- a/x11-apps/xinput/metadata.xml
+++ b/x11-apps/xinput/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>x11</herd>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:x.org:xinput</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-apps/xrdb/metadata.xml b/x11-apps/xrdb/metadata.xml
index 01c4c00..3517217 100644
--- a/x11-apps/xrdb/metadata.xml
+++ b/x11-apps/xrdb/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>x11</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:matthias_hopf:xrdb</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index b5a25ce..fc83229 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -15,4 +15,7 @@
     <flag name='legacy-drivers'>Include the buggy gradients patch (for legacy drivers, such as nvidia-drivers older than 304.30)</flag>
     <flag name='openvg'>Use OpenVG for backend acceleration</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index 2652778..df813ea 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -16,4 +16,7 @@
     <flag name="packagekit">Enable support for the distro-neutral package
 	  manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
index 01c4c00..ef95d0c 100644
--- a/x11-libs/libX11/metadata.xml
+++ b/x11-libs/libX11/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>x11</herd>
+<upstream>
+  <remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index bd23997..78a1374 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -6,4 +6,7 @@
 	<flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
 	<flag name="mmxext">Enable MMX2 support.</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:pixman:pixman</remote-id>
+</upstream>
 </pkgmetadata>