gentoo resync : 23.03.2018

4 files changed, 9 insertions, 2 deletions

diff --git a/profiles/desc/kernel.desc b/profiles/desc/kernel.desc
index 0af11db2795a..48d6e5455ea8 100644
--- a/profiles/desc/kernel.desc
+++ b/profiles/desc/kernel.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of KERNEL USE_EXPAND flags.
@@ -8,8 +8,8 @@ AIX - KERNEL setting for system using the AIX kernel
 Darwin - KERNEL setting for system using the Darwin kernel (i.e.: Mac OS X).
 FreeBSD - KERNEL setting for system using the FreeBSD kernel
 freemint - KERNEL setting for system using the FreeMiNT kernel
-linux - KERNEL setting for system using the Linux kernel
 HPUX - KERNEL setting for system using the HP-UX kernel
+linux - KERNEL setting for system using the Linux kernel
 NetBSD - KERNEL setting for system using the NetBSD kernel
 OpenBSD - KERNEL setting for system using the OpenBSD kernel
 SunOS - KERNEL setting for system using an SunOS (i.e.: Solaris) kernel
diff --git a/profiles/desc/nginx_modules_http.desc b/profiles/desc/nginx_modules_http.desc
index 0bc63df6e1ca..656dd577c1d9 100644
--- a/profiles/desc/nginx_modules_http.desc
+++ b/profiles/desc/nginx_modules_http.desc
@@ -25,6 +25,7 @@ fastcgi - This module allows Nginx to interact with FastCGI processes and contro
 flv - This module provides the ability to seek within FLV (Flash) files using time-based offsets.
 geo - This module creates variables, whose values depend on the IP-address of the client.
 geoip - This module creates variables based on the IP-address of the client matched against the MaxMind GeoIP binary files.
+grpc - This module provides gRPC support.
 gunzip - Permits to decompress gzip'ed files on-the-fly for clients not supporting the gzip encoding method.
 gzip - This module allows for on-the-fly gzip compression.
 gzip_static - Before serving a file from disk to a gzip-enabled client, this module will look for a precompressed file in the same location.
diff --git a/profiles/desc/qemu_softmmu_targets.desc b/profiles/desc/qemu_softmmu_targets.desc
index 19bcfdebdd93..ed2e3cdd4942 100644
--- a/profiles/desc/qemu_softmmu_targets.desc
+++ b/profiles/desc/qemu_softmmu_targets.desc
@@ -25,6 +25,8 @@ or1k - OpenRISC system emulation target
 ppc64 - system emulation target
 ppcemb - system emulation target
 ppc - system emulation target
+riscv32 - system emulation target
+riscv64 - system emulation target
 s390x - system emulation target
 sh4eb - system emulation target
 sh4 - system emulation target
diff --git a/profiles/desc/qemu_user_targets.desc b/profiles/desc/qemu_user_targets.desc
index 721a1f566e20..303ad231b91f 100644
--- a/profiles/desc/qemu_user_targets.desc
+++ b/profiles/desc/qemu_user_targets.desc
@@ -28,6 +28,8 @@ ppc64abi32 - userspace emulation target
 ppc64le - PowerPC 64-bit little endian userspace emulation target
 ppc64 - PowerPC 64-bit big endian userspace emulation target
 ppc - PowerPC 32-bit big endian userspace emulation target
+riscv32 - userspace emulation target
+riscv64 - userspace emulation target
 s390x - userspace emulation target
 sh4eb - userspace emulation target
 sh4 - userspace emulation target
@@ -36,3 +38,5 @@ sparc64 - userspace emulation target
 sparc - userspace emulation target
 tilegx - TILE-Gx 64-bit userspace emulation target
 x86_64 - userspace emulation target
+xtensaeb - userspace emulation target
+xtensa - userspace emulation target