[gentoo-commits] repo/gentoo:master commit in: dev-libs/pkcs11-helper/, app-text/poppler/, media-libs/libvpx/, ...

[Mike Frysinger]

commit:     c56f9849b65f48f650e7436882f4c5681ce4eb43
Author:     Allen Webb <allenwebb <AT> chromium <DOT> org>
AuthorDate: Thu Sep 12 20:55:10 2019 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 21:42:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56f9849

metadata.xml: popuplate CPE entries for better CVE tracking

Signed-off-by: Allen Webb <allenwebb <AT> chromium.org>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 app-accessibility/brltty/metadata.xml        | 3 +++
 app-arch/cpio/metadata.xml                   | 3 +++
 app-arch/libarchive/metadata.xml             | 1 +
 app-arch/pigz/metadata.xml                   | 3 +++
 app-arch/unzip/metadata.xml                  | 1 +
 app-arch/xz-utils/metadata.xml               | 3 +++
 app-crypt/gnupg/metadata.xml                 | 3 +++
 app-misc/jq/metadata.xml                     | 1 +
 app-text/ghostscript-gpl/metadata.xml        | 1 +
 app-text/htmltidy/metadata.xml               | 1 +
 app-text/poppler/metadata.xml                | 3 +++
 app-text/qpdf/metadata.xml                   | 1 +
 dev-libs/boost/metadata.xml                  | 1 +
 dev-libs/confuse/metadata.xml                | 1 +
 dev-libs/elfutils/metadata.xml               | 3 +++
 dev-libs/fribidi/metadata.xml                | 3 +++
 dev-libs/gmp/metadata.xml                    | 3 +++
 dev-libs/libbsd/metadata.xml                 | 3 +++
 dev-libs/libcroco/metadata.xml               | 3 +++
 dev-libs/libdaemon/metadata.xml              | 3 +++
 dev-libs/libestr/metadata.xml                | 1 +
 dev-libs/libfastjson/metadata.xml            | 1 +
 dev-libs/libffi/metadata.xml                 | 3 +++
 dev-libs/libgcrypt/metadata.xml              | 3 +++
 dev-libs/liblogging/metadata.xml             | 1 +
 dev-libs/libltdl/metadata.xml                | 3 +++
 dev-libs/libp11/metadata.xml                 | 1 +
 dev-libs/libtasn1/metadata.xml               | 3 +++
 dev-libs/libxslt/metadata.xml                | 3 +++
 dev-libs/libzip/metadata.xml                 | 3 +++
 dev-libs/lzo/metadata.xml                    | 3 +++
 dev-libs/nettle/metadata.xml                 | 3 +++
 dev-libs/nspr/metadata.xml                   | 3 +++
 dev-libs/pkcs11-helper/metadata.xml          | 1 +
 dev-libs/protobuf/metadata.xml               | 1 +
 dev-libs/vala-common/metadata.xml            | 3 +++
 dev-util/android-tools/metadata.xml          | 1 +
 media-gfx/imagemagick/metadata.xml           | 3 +++
 media-gfx/sane-backends/metadata.xml         | 3 +++
 media-libs/fontconfig/metadata.xml           | 3 +++
 media-libs/freeimage/metadata.xml            | 1 +
 media-libs/harfbuzz/metadata.xml             | 3 +++
 media-libs/lcms/metadata.xml                 | 1 +
 media-libs/libexif/metadata.xml              | 1 +
 media-libs/libmtp/metadata.xml               | 1 +
 media-libs/libvorbis/metadata.xml            | 3 +++
 media-libs/libvpx/metadata.xml               | 3 +++
 media-libs/mesa/metadata.xml                 | 1 +
 media-libs/opencv/metadata.xml               | 1 +
 media-sound/sox/metadata.xml                 | 1 +
 net-analyzer/netperf/metadata.xml            | 3 +++
 net-analyzer/tcpdump/metadata.xml            | 1 +
 net-dialup/minicom/metadata.xml              | 3 +++
 net-dns/avahi/metadata.xml                   | 1 +
 net-dns/libidn2/metadata.xml                 | 3 +++
 net-firewall/conntrack-tools/metadata.xml    | 3 +++
 net-libs/gnutls/metadata.xml                 | 3 +++
 net-libs/grpc/metadata.xml                   | 1 +
 net-libs/libmnl/metadata.xml                 | 3 +++
 net-libs/libndp/metadata.xml                 | 3 +++
 net-libs/libnetfilter_conntrack/metadata.xml | 3 +++
 net-libs/libnetfilter_cthelper/metadata.xml  | 3 +++
 net-libs/libnetfilter_cttimeout/metadata.xml | 3 +++
 net-libs/libnetfilter_queue/metadata.xml     | 3 +++
 net-libs/libnfnetlink/metadata.xml           | 3 +++
 net-libs/libpcap/metadata.xml                | 1 +
 net-libs/libtirpc/metadata.xml               | 1 +
 net-misc/bridge-utils/metadata.xml           | 1 +
 net-misc/iperf/metadata.xml                  | 1 +
 net-misc/radvd/metadata.xml                  | 3 +++
 net-misc/socat/metadata.xml                  | 3 +++
 net-print/cups/metadata.xml                  | 1 +
 net-print/hplip/metadata.xml                 | 1 +
 net-wireless/hostapd/metadata.xml            | 3 +++
 net-wireless/iw/metadata.xml                 | 3 +++
 net-wireless/wireless-tools/metadata.xml     | 3 +++
 sys-apps/attr/metadata.xml                   | 3 +++
 sys-apps/dtc/metadata.xml                    | 3 +++
 sys-apps/ethtool/metadata.xml                | 3 +++
 sys-apps/iproute2/metadata.xml               | 3 +++
 sys-boot/syslinux/metadata.xml               | 3 +++
 sys-devel/libtool/metadata.xml               | 3 +++
 sys-fs/dosfstools/metadata.xml               | 1 +
 sys-fs/e2fsprogs/metadata.xml                | 2 +-
 sys-fs/exfat-utils/metadata.xml              | 1 +
 sys-fs/mtd-utils/metadata.xml                | 3 +++
 sys-fs/mtools/metadata.xml                   | 3 +++
 sys-fs/xfsprogs/metadata.xml                 | 3 +++
 sys-libs/e2fsprogs-libs/metadata.xml         | 1 +
 sys-libs/ldb/metadata.xml                    | 3 +++
 sys-libs/libcap-ng/metadata.xml              | 3 +++
 sys-libs/libcap/metadata.xml                 | 3 +++
 sys-libs/libselinux/metadata.xml             | 1 +
 sys-libs/libsepol/metadata.xml               | 1 +
 sys-libs/ncurses/metadata.xml                | 3 +++
 sys-libs/readline/metadata.xml               | 3 +++
 sys-process/lsof/metadata.xml                | 3 +++
 x11-libs/gdk-pixbuf/metadata.xml             | 3 +++
 x11-libs/libXdmcp/metadata.xml               | 3 +++
 x11-libs/libxcb/metadata.xml                 | 3 +++
 x11-libs/libxkbcommon/metadata.xml           | 3 +++
 x11-misc/xkeyboard-config/metadata.xml       | 3 +++
 102 files changed, 232 insertions(+), 1 deletion(-)

diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index b05083dfd09..8f4dd156f0c 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -15,6 +15,9 @@
   <flag name="pcm">support for sound card digital audio</flag>
   <flag name="speech">speech support</flag>
 </use>
+<upstream>
+  <remote-id type="cpe">cpe:/a:mielke:brltty</remote-id>
+</upstream>
 <longdescription lang="en">
 BRLTTY is a background process (daemon) which provides access to the Linux/Unix
 console (when in text mode) for a blind person using a refreshable braille

diff --git a/app-arch/cpio/metadata.xml b/app-arch/cpio/metadata.xml
index 56c12441305..867891812d3 100644
--- a/app-arch/cpio/metadata.xml
+++ b/app-arch/cpio/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:cpio</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index 8451f55586c..69042b3e722 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -33,6 +33,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libarchive:libarchive</remote-id>
 		<remote-id type="github">libarchive/libarchive</remote-id>
 		<bugs-to>https://github.com/libarchive/libarchive/issues</bugs-to>
 	</upstream>

diff --git a/app-arch/pigz/metadata.xml b/app-arch/pigz/metadata.xml
index 478203e0a5c..09caf7efa57 100644
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="symlink">Install symlinks which override <pkg>app-arch/gzip</pkg> implementation</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:zlib:pigz</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml
index 564fd76677c..ed43f8ee64f 100644
--- a/app-arch/unzip/metadata.xml
+++ b/app-arch/unzip/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="natspec">Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:info-zip:unzip</remote-id>
 		<remote-id type="sourceforge">infozip</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index fac09b73379..74270db09ca 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -10,4 +10,7 @@
 		used in any of the default xz presets. This includes delta
 		and BCJ coders, additional match finders and SHA256 checks.</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:tukaani:xz</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 8f54fc7a736..6abd36d9b6a 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -35,4 +35,7 @@
 		Install the wks-server
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnupg:gnupg</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
index d9b5cb1343c..ce9b0102c59 100644
--- a/app-misc/jq/metadata.xml
+++ b/app-misc/jq/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:jq_project:jq</remote-id>
 		<remote-id type="github">stedolan/jq</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index 9f69512715c..61a1c44676c 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Printing Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:artifex:gpl_ghostscript</remote-id>
 		<remote-id type="sourceforge">djvu</remote-id>
 		<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
 	</upstream>

diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 3fbef354e7d..295e7000121 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="cpe">cpe:/a:html-tidy:tidy</remote-id>
 		<remote-id type="sourceforge">tidy</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 3f8d6be9f98..e88e31fc283 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -17,6 +17,9 @@
 	<email>office@g.o</email>
 	<description>Please CC on stabilisation bugs</description>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:freedesktop:poppler</remote-id>
+</upstream>
 <use>
 	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
 	<flag name="utils">Install command-line PDF converters and various utilities.</flag>

diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index ce823e597ac..fda6f880d91 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:qpdf_project:qpdf</remote-id>
 		<remote-id type="sourceforge">qpdf</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 9d4579b80fb..997c258c600 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:boost:boost</remote-id>
 		<remote-id type="sourceforge">boost</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/confuse/metadata.xml b/dev-libs/confuse/metadata.xml
index d7752ca1cd3..3b320c11f64 100644
--- a/dev-libs/confuse/metadata.xml
+++ b/dev-libs/confuse/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libconfuse_project:libconfuse</remote-id>
 		<remote-id type="github">martinh/libconfuse</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 14c09d810f3..7d0275bbf23 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="threads">Build the libraries with thread safe support</flag>
 		<flag name="utils">Install command-line utilities (all the eu-* programs)</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:elfutils_project:elfutils</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/fribidi/metadata.xml b/dev-libs/fribidi/metadata.xml
index 996e7cacd21..8cfcbe768dc 100644
--- a/dev-libs/fribidi/metadata.xml
+++ b/dev-libs/fribidi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@g.o</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fribidi:gnu_fribidi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index 5fa58802c03..84e19205350 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libbsd/metadata.xml b/dev-libs/libbsd/metadata.xml
index 0f6db5621bc..1ff7e0b3b45 100644
--- a/dev-libs/libbsd/metadata.xml
+++ b/dev-libs/libbsd/metadata.xml
@@ -5,4 +5,7 @@
     <email>freedesktop-bugs@g.o</email>
     <name>Gentoo Freedesktop Project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:libbsd:libbsd</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/dev-libs/libcroco/metadata.xml b/dev-libs/libcroco/metadata.xml
index d296a917b37..f2d6a4b24c2 100644
--- a/dev-libs/libcroco/metadata.xml
+++ b/dev-libs/libcroco/metadata.xml
@@ -13,4 +13,7 @@ A parser module with : A SAC like api and A CSSOM like api.
 A CSS2 selection engine
 An XML/CSS layout/rendering engine
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:libcroco</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libdaemon/metadata.xml b/dev-libs/libdaemon/metadata.xml
index 03f633b16af..f13cc8c4e7c 100644
--- a/dev-libs/libdaemon/metadata.xml
+++ b/dev-libs/libdaemon/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>eva@g.o</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libdaemon_project:libdaemon</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index 363a45aabdf..ac4e1be046f 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to>
 		<remote-id type="github">rsyslog/libestr</remote-id>
+		<remote-id type="cpe">cpe:/a:adiscon:libestr</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libfastjson/metadata.xml b/dev-libs/libfastjson/metadata.xml
index 11529b22803..a90b6aa3f78 100644
--- a/dev-libs/libfastjson/metadata.xml
+++ b/dev-libs/libfastjson/metadata.xml
@@ -11,5 +11,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libfastjson/issues</bugs-to>
 		<remote-id type="github">rsyslog/libfastjson</remote-id>
+		<remote-id type="cpe">cpe:/a:rsyslog:libfastjson</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index d8fae30b11e..6e9a28c5ac8 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -36,4 +36,7 @@
 	<use>
 		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 9b7e9f273f5..f983c8bdca4 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -9,6 +9,9 @@
 		<email>crypto@g.o</email>
 		<name>Crypto</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnupg:libgcrypt</remote-id>
+	</upstream>
 <use>
 <flag name="o-flag-munging">Enable O-flag mangling during build</flag>
 </use>

diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 50284e1c156..06391ac7ae2 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -19,6 +19,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:adiscon:liblogging</remote-id>
 		<remote-id type="github">rsyslog/liblogging</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libltdl/metadata.xml b/dev-libs/libltdl/metadata.xml
index 56c12441305..c9dbcd91042 100644
--- a/dev-libs/libltdl/metadata.xml
+++ b/dev-libs/libltdl/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libp11/metadata.xml b/dev-libs/libp11/metadata.xml
index d6d0837d385..831b8dce3af 100644
--- a/dev-libs/libp11/metadata.xml
+++ b/dev-libs/libp11/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="doc">Generate and install API documentation for the package.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
 		<remote-id type="github">opensc/libp11</remote-id>
 		<remote-id type="sourceforge">opensc</remote-id>
 	</upstream>

diff --git a/dev-libs/libtasn1/metadata.xml b/dev-libs/libtasn1/metadata.xml
index c7fc0ea791d..6b44d2e7957 100644
--- a/dev-libs/libtasn1/metadata.xml
+++ b/dev-libs/libtasn1/metadata.xml
@@ -10,4 +10,7 @@
 			Enable usage of <pkg>dev-util/valgrind</pkg> in debug
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:libtasn1</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/libxslt/metadata.xml b/dev-libs/libxslt/metadata.xml
index 4cbddcaa19a..4073f76c700 100644
--- a/dev-libs/libxslt/metadata.xml
+++ b/dev-libs/libxslt/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@g.o</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:xmlsoft:libxslt</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 87a5b99d4f3..7f6898ece72 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -9,6 +9,9 @@
 	<email>kde@g.o</email>
 	<name>Gentoo KDE Project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:nih:libzip</remote-id>
+</upstream>
 <use>
 	<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
 </use>

diff --git a/dev-libs/lzo/metadata.xml b/dev-libs/lzo/metadata.xml
index 0319eec4c8b..3300f7ef6f9 100644
--- a/dev-libs/lzo/metadata.xml
+++ b/dev-libs/lzo/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@g.o</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:lzo_project:lzo</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index 040cba5f7c5..213251be9d0 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -5,4 +5,7 @@
 		<email>crypto@g.o</email>
 		<name>Crypto</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:nettle_project:nettle</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
index d9b367ed3b9..cf9988e49a3 100644
--- a/dev-libs/nspr/metadata.xml
+++ b/dev-libs/nspr/metadata.xml
@@ -5,4 +5,7 @@
 	<email>mozilla@g.o</email>
 	<name>Gentoo Mozilla Team</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mozilla:netscape_portable_runtime</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/dev-libs/pkcs11-helper/metadata.xml b/dev-libs/pkcs11-helper/metadata.xml
index 4a627dd9cc2..5ee8a8c1f2a 100644
--- a/dev-libs/pkcs11-helper/metadata.xml
+++ b/dev-libs/pkcs11-helper/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="nss">Enable NSS crypto engine</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opensc-project:opensc</remote-id>
 		<remote-id type="sourceforge">opensc</remote-id>
 		<remote-id type="github">OpenSC/pkcs11-helper</remote-id>
 	</upstream>

diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index dc51da78a36..6858f31af62 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -14,6 +14,7 @@
 		<subslots>Soname version number</subslots>
 	</slots>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:google:protobuf</remote-id>
 		<remote-id type="github">protocolbuffers/protobuf</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/vala-common/metadata.xml b/dev-libs/vala-common/metadata.xml
index 39980802b1d..243d9d0d89c 100644
--- a/dev-libs/vala-common/metadata.xml
+++ b/dev-libs/vala-common/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@g.o</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:vala</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml
index 27a6743c270..b64b92754f3 100644
--- a/dev-util/android-tools/metadata.xml
+++ b/dev-util/android-tools/metadata.xml
@@ -5,6 +5,7 @@
 		<bugs-to>https://code.google.com/p/android/issues/list</bugs-to>
 		<changelog>https://android.googlesource.com/platform/system/core.git/+log/HEAD</changelog>
 		<doc>https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT</doc>
+		<remote-id type="cpe">cpe:/a:google:android_debug_bridge</remote-id>
 		<remote-id type="github">android/platform_system_core</remote-id>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>

diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 0ca390d487a..0c9668ee1af 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -16,4 +16,7 @@
     <flag name="q32">Set quantum depth value to 32</flag>
     <flag name="q8">Set quantum depth value to 8</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 6f49eba8f49..92df0ba49ba 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<upstream>
+<remote-id type="cpe">cpe:/a:sane-backends_project:sane-backends</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/media-libs/fontconfig/metadata.xml b/media-libs/fontconfig/metadata.xml
index cdd439d7450..3a00fc9df0a 100644
--- a/media-libs/fontconfig/metadata.xml
+++ b/media-libs/fontconfig/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Fonts</name>
 	</maintainer>
 	<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fontconfig_project:fontconfig</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-libs/freeimage/metadata.xml b/media-libs/freeimage/metadata.xml
index fec64097dad..5f7533f155c 100644
--- a/media-libs/freeimage/metadata.xml
+++ b/media-libs/freeimage/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:freeimage_project:freeimage</remote-id>
 		<remote-id type="sourceforge">freeimage</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
index cb52496a196..1c768f83411 100644
--- a/media-libs/harfbuzz/metadata.xml
+++ b/media-libs/harfbuzz/metadata.xml
@@ -13,6 +13,9 @@
 		<email>gnome@g.o</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:harfbuzz_project:harfbuzz</remote-id>
+	</upstream>
 	<use>
 		<flag name="glib">Compile with GLib Unicode support</flag>
 		<flag name="graphite">Use graphite to render complex non-Roman writing systems</flag>

diff --git a/media-libs/lcms/metadata.xml b/media-libs/lcms/metadata.xml
index 08400576a0f..a42c089bd59 100644
--- a/media-libs/lcms/metadata.xml
+++ b/media-libs/lcms/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Printing Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:littlecms:little_cms_color_engine</remote-id>
 		<remote-id type="sourceforge">lcms</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index 9e6e2525476..fc7d045d25f 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Graphics Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:curtis_galloway:libexif</remote-id>
 		<remote-id type="sourceforge">libexif</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 88c60f729d0..7b15a68479f 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libmtp_project:libmtp</remote-id>
 		<remote-id type="sourceforge">libmtp</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/libvorbis/metadata.xml b/media-libs/libvorbis/metadata.xml
index c870d0eef0a..1240f83acdc 100644
--- a/media-libs/libvorbis/metadata.xml
+++ b/media-libs/libvorbis/metadata.xml
@@ -5,4 +5,7 @@
 	<email>sound@g.o</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:xiph:libvorbis</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index 5ef09d66f08..af10bdba348 100644
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/metadata.xml
@@ -13,4 +13,7 @@
 		<flag name="postproc">Enable additional post processing filters</flag>
 		<flag name="svc">Enable spatial-svc support (experimental)</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:john_koleszar:libvpx</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 81c21d9fef2..73e827967ce 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:mesa3d:mesa</remote-id>
 		<remote-id type="sourceforge">mesa3d</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index ec3913cbbdd..e9ef881716d 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -29,6 +29,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
 		<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:opencv:opencv</remote-id>
 		<remote-id type="sourceforge">opencvlibrary</remote-id>
 		<remote-id type="github">Itseez/opencv_contrib</remote-id>
 	</upstream>

diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index 9f80c9612ea..c891b42123b 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:soundexchange:sound_exchange</remote-id>
     <remote-id type="sourceforge">sox</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index 8b0f12738e3..d9e80b8c44f 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/metadata.xml
@@ -19,4 +19,7 @@ netperf include:
 <use>
 <flag name="demo">Emit interim results during the run. May affect results</flag>
 </use>
+<upstream>
+<remote-id type="cpe">cpe:/a:netperf:netperf</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 2d5b8e1103b..926985b6a8c 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:tcpdump:tcpdump</remote-id>
 		<remote-id type="github">the-tcpdump-group/tcpdump</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index 6c2a6ce03ca..acd06db3222 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@@ -9,4 +9,7 @@
     Minicom is a menu driven communications program. It emulates ANSI and VT102
     terminals. It has a dialing directory and auto zmodem download.
   </longdescription>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:minicom_project:minicom</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 046761ce22c..aa917b89cf2 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -20,5 +20,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">lathiat/avahi</remote-id>
+		<remote-id type="cpe">cpe:/a:avahi:avahi</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml
index 5ba62861f1c..87360eddc9b 100644
--- a/net-dns/libidn2/metadata.xml
+++ b/net-dns/libidn2/metadata.xml
@@ -4,4 +4,7 @@
 <maintainer type="person">
 <email>jer@g.o</email>
 </maintainer>
+<upstream>
+<remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index b30175c9505..57e4187d166 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -12,6 +12,9 @@ is the module that provides stateful packet inspection for iptables. The
 conntrack-tools are the userspace daemon conntrackd and the command line
 interface conntrack.
 </longdescription>
+<upstream>
+<remote-id type="cpe">cpe:/a:netfilter:conntrack-tools</remote-id>
+</upstream>
 <use>
 <flag name="libtirpc">Use <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 <flag name="cthelper">Use <pkg>net-libs/libnetfilter_cthelper</pkg> for userspace conntrack helper support</flag>

diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index d90b1d71c77..20e6efaa665 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -38,4 +38,7 @@
   <slots>
    <subslots>Reflect ABI compatibility of libgnutls.so</subslots>
   </slots>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnu:gnutls</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index ccbc56aeed7..6267f34d90d 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:grpc:grpc</remote-id>
 		<remote-id type="github">grpc/grpc</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index 7d46164bb17..8e3ebff5ba4 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -12,4 +12,7 @@
 	library aims to provide simple helpers that allows you to re-use code and to
 	avoid re-inventing the wheel.
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libmnl</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml
index 39980802b1d..55c542b4952 100644
--- a/net-libs/libndp/metadata.xml
+++ b/net-libs/libndp/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@g.o</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libndp:libndp</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
index 74c2baebb4e..e5e613464db 100644
--- a/net-libs/libnetfilter_conntrack/metadata.xml
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@g.o</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_conntrack</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-libs/libnetfilter_cthelper/metadata.xml b/net-libs/libnetfilter_cthelper/metadata.xml
index 2c2a7923cfc..ceb2db8aac8 100644
--- a/net-libs/libnetfilter_cthelper/metadata.xml
+++ b/net-libs/libnetfilter_cthelper/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@g.o</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_cthelper</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
index 74c2baebb4e..430482ee0ae 100644
--- a/net-libs/libnetfilter_cttimeout/metadata.xml
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@g.o</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_cttimeout</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
index 74c2baebb4e..36c0581a520 100644
--- a/net-libs/libnetfilter_queue/metadata.xml
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@g.o</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnetfilter_queue</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
index 74c2baebb4e..4bdfc11bfc0 100644
--- a/net-libs/libnfnetlink/metadata.xml
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -5,4 +5,7 @@
 	<email>netmon@g.o</email>
 	<name>Gentoo network monitoring and analysis project</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:netfilter:libnfnetlink</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 488e8703b17..241fb6113b5 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -9,6 +9,7 @@
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
 </use>
 <upstream>
+<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
 <remote-id type="github">the-tcpdump-group/libpcap</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
index 36e84cdfa7e..9034a1198e4 100644
--- a/net-libs/libtirpc/metadata.xml
+++ b/net-libs/libtirpc/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:libtirpc_project:libtirpc</remote-id>
 		<remote-id type="sourceforge">libtirpc</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index 995aec82049..4320f1c5d7c 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/metadata.xml
@@ -9,6 +9,7 @@
     <name>Gentoo Base System</name>
   </maintainer>
   <upstream>
+    <remote-id type="cpe">cpe:/a:kernel:bridge-utils</remote-id>
     <remote-id type="sourceforge">bridge</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 344d7ddf0bf..6941792a118 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -6,6 +6,7 @@
 <name>Gentoo network monitoring and analysis project</name>
 </maintainer>
 <upstream>
+<remote-id type="cpe">cpe:/a:iperf_project:iperf</remote-id>
 <remote-id type="github">esnet/iperf</remote-id>
 <remote-id type="sourceforge">iperf</remote-id>
 </upstream>

diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 3ffdeb4af3b..a0f2278d1ed 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/metadata.xml
@@ -5,4 +5,7 @@
 		<email>prometheanfire@g.o</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:litech:router_advertisement_daemon</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 2c2a7923cfc..70bb6410439 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/metadata.xml
@@ -5,4 +5,7 @@
 		<email>netmon@g.o</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:dest-unreach:socat</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 50dcb809dbb..eefca8bd29d 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -17,6 +17,7 @@
     </flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:apple:cups</remote-id>
     <remote-id type="github">apple/cups</remote-id>
   </upstream>
 </pkgmetadata>

diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 52a5e27617f..26f82b7f184 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -24,6 +24,7 @@
 		<flag name="X">Enables scanner GUI dependencies with USE="scanner" where <pkg>media-gfx/xsane</pkg> is preferred over <pkg>media-gfx/sane-frontends</pkg></flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:hp:linux_imaging_and_printing_project</remote-id>
 		<remote-id type="sourceforge">hplip</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 7cce4a9bd8d..b06f07f2352 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -22,4 +22,7 @@
 		<email>zerochaos@g.o</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:w1.fi:hostapd</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-wireless/iw/metadata.xml b/net-wireless/iw/metadata.xml
index 2b9b4266ca5..7b261cf7822 100644
--- a/net-wireless/iw/metadata.xml
+++ b/net-wireless/iw/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zerochaos@g.o</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:kernel:iw</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-wireless/wireless-tools/metadata.xml b/net-wireless/wireless-tools/metadata.xml
index 994039f3221..b6db26b5282 100644
--- a/net-wireless/wireless-tools/metadata.xml
+++ b/net-wireless/wireless-tools/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="multicall">Build the most commonly used tools as one
 			binary</flag>
 	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:wireless_tools:wireless_tools</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 56c12441305..b8a192ea806 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:attr_project:attr</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index bc8ad1abc48..9d02ff2575d 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/metadata.xml
@@ -8,4 +8,7 @@
 	<email>ppc@g.o</email>
 	<name>Gentoo Linux PowerPC Development</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 0061d51971d..760ac849b6b 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/metadata.xml
@@ -16,4 +16,7 @@
 		* Control receive queue selection for multiqueue devices
 		* Upgrade firmware in flash memory
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:kernel:ethtool</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index ad652efcf7e..66ef219fafa 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -11,4 +11,7 @@
 	<flag name="iptables">include support for iptables filtering</flag>
 	<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:iproute2_project:iproute2</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index dbe176cabd0..72e7472ad1e 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -8,4 +8,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml
index 56c12441305..c9dbcd91042 100644
--- a/sys-devel/libtool/metadata.xml
+++ b/sys-devel/libtool/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index ffedbfb729c..85825b41c0d 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:dosfstools_project:dosfstools</remote-id>
 	<remote-id type="github">dosfstools/dosfstools</remote-id>
 </upstream>
 <use>

diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index 4ffc67ac95a..fd229917a07 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -10,7 +10,7 @@
 	<flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag>
 </use>
 <upstream>
-	<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
+	<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index 2b2d336f4ad..e71e375cd5f 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -9,6 +9,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:exfat_prokect:exfat</remote-id>
 	<remote-id type="google-code">exfat</remote-id>
 	<remote-id type="github">relan/exfat</remote-id>
 </upstream>

diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml
index 7d84a262b64..9075500ddb8 100644
--- a/sys-fs/mtd-utils/metadata.xml
+++ b/sys-fs/mtd-utils/metadata.xml
@@ -8,4 +8,7 @@
 	<email>embedded@g.o</email>
 	<name>Embedded Gentoo</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mtd-utils_project:mtd-utils</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-fs/mtools/metadata.xml b/sys-fs/mtools/metadata.xml
index 56c12441305..dd09ab641ca 100644
--- a/sys-fs/mtools/metadata.xml
+++ b/sys-fs/mtools/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:mtools:*</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 4eb20a048df..a582335304e 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -5,4 +5,7 @@
 		<email>base-system@g.o</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:sgi:xfsprogs</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
index fb37f7ff111..3455ebb9dca 100644
--- a/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sys-libs/e2fsprogs-libs/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <upstream>
+	<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id>
 	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml
index db4a710716a..59707847710 100644
--- a/sys-libs/ldb/metadata.xml
+++ b/sys-libs/ldb/metadata.xml
@@ -5,6 +5,9 @@
 		<email>samba@g.o</email>
 		<name>Samba</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:samba:samba</remote-id>
+	</upstream>
 	<use>
 		<flag name="doc">Builds documentation</flag>
 		<flag name="ldap">Enable LDAP support</flag>

diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index 9aa642f3201..e9dd1667483 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/metadata.xml
@@ -11,4 +11,7 @@
 	utilities that can analyse all currently running applications and print
 	out any capabilities and whether or not it has an open ended bounding set.
 </longdescription>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libcap-ng_project:libcap-ng</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index 56c12441305..d10107478bd 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@g.o</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:libcap:libcap</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 537e0aa97df..92059a54b96 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="pcre2">Use <pkg>dev-libs/libpcre2</pkg> for fcontext regexes</flag>
 	</use>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:selinuxproject:libselinux</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sys-libs/libsepol/metadata.xml b/sys-libs/libsepol/metadata.xml
index ef117d5eac5..1ff444ab65c 100644
--- a/sys-libs/libsepol/metadata.xml
+++ b/sys-libs/libsepol/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<longdescription>SELinux library for manipulating binary security policies</longdescription>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:selinuxproject:libsepol</remote-id>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index 888a6adf663..1030e9cebba 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -14,4 +14,7 @@
 	</flag>
 	<flag name="trace">Enable test trace() support in ncurses calls</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:ncurses</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index 49d63436c4b..6bce63269f8 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:readline</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index 4f913c0bcab..159182173ae 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="rpc">support looking up RPC service info</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:lsof_project:lsof</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 6c6d2ea40eb..8901219e268 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 	<flag name="X">Build and install the legacy gdk_pixbuf_xlib-2.0 library</flag>
 </use>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnome:gdk-pixbuf</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index e943b72b8a4..8b173f9d4e9 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -5,4 +5,7 @@
 	<email>x11@g.o</email>
 	<name>X11</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:x.org:libxdmcp</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index c68f9e8922a..396f8bde1da 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="xkb">Enable the XCB keyboard extension</flag>
   </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:x:libxcb</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 7a7bbf81054..720e8a2f5f0 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -5,4 +5,7 @@
 		<email>x11@g.o</email>
 		<name>X11</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:xkbcommon:libxkbcommon</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index e943b72b8a4..d3cbfbdb344 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/metadata.xml
@@ -5,4 +5,7 @@
 	<email>x11@g.o</email>
 	<name>X11</name>
 </maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:xkeyboard_config_project:xkeyboard-config</remote-id>
+</upstream>
 </pkgmetadata>