gentoo resync : 19.03.2019

5 files changed, 5 insertions, 17 deletions

diff --git a/profiles/desc/jvm_variant.desc b/profiles/desc/jvm_variant.desc
deleted file mode 100644
index 940cfd8fd139..000000000000
--- a/profiles/desc/jvm_variant.desc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of JVM_VARIANT USE_EXPAND
-# for dev-java/openjdk.
-
-client - Enable many JVM feature sets including compiler1
-core -  A template-interpreter only JVM feature set
-minimal - Enable a reduced compiler1 JVM feature set
-server - Enable most JVM feature sets including compiler1, compiler2, and aot
-zero - Zero-Assembler port of the JVM
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index 5c69a78b2aab..4d30aa57eb3d 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -145,7 +145,6 @@ sa - Sanskrit
 sat - Santali
 sco - Scots
 sd - Sindhi
-se - Northern Sami
 si - Sinhala
 sid - Sidamo
 sk - Slovak
@@ -181,6 +180,5 @@ vi - Vietnamese
 xh - Xhosa
 zh - Chinese
 zh-CN - Chinese (China)
-zh-HK - Chinese (Hong Kong)
 zh-TW - Chinese (Taiwan)
 zu - Zulu
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index 9d1ad482394f..2cc4ca290e55 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -6,6 +6,7 @@
 # Keep it sorted.
 acoolsdcm - Add support for Alphacool USB display modules
 astusb - Add support for ASTUSB LCD modules
+ax206dpf - Add support for AX206 DPF LCD modules
 bayrad - Add support for BayRAD LCD modules by EMAC
 beckmannegle - Add support for Beckmann+Egle "Mini Terminals" and "Compact Terminals"
 bwct - Add support for BWCT USB LCD displays
@@ -88,6 +89,7 @@ pertelian - Add support for the Pertelian X2040 displays
 phanderson - Add support for the PHAnderson serial-to-HD44780 controller
 picgraphic - Add support for PIC graphic displays
 picolcd - Add support for Mini-Box's picoLCD
+picolcd_256x64 - Add support for Mini-Box's picoLCD with a higher resolution
 picolcdgraphic - Add support for Mini-Box's graphical picoLCD
 png - Add support for PNG output
 ppm - Add support for PNG output
diff --git a/profiles/desc/qemu_softmmu_targets.desc b/profiles/desc/qemu_softmmu_targets.desc
index ed2e3cdd4942..4a48f28fdede 100644
--- a/profiles/desc/qemu_softmmu_targets.desc
+++ b/profiles/desc/qemu_softmmu_targets.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of QEMU_SOFTMMU_TARGETS USE_EXPAND flags.
@@ -23,7 +23,6 @@ moxie - moxielogic system emulation target
 nios2 - system emulation target
 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
diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index bfee3a2eee7f..8229151128ac 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2019 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of VIDEO_CARDS USE_EXPAND flags.
@@ -17,8 +17,8 @@ i915 - VIDEO_CARDS setting to build driver for Intel i915 video cards
 i965 - VIDEO_CARDS setting to build driver for Intel i965 video cards
 imx - VIDEO_CARDS setting to build driver for Freescale i.MX video cards
 intel - VIDEO_CARDS setting to build driver for Intel video cards
+iris - VIDEO_CARDS setting to build driver for Intel video cards Gen8 / Broadwell or newer
 mga - VIDEO_CARDS setting to build driver for mga video cards
-newport - VIDEO_CARDS setting to build driver for newport video cards
 nouveau - VIDEO_CARDS setting to build reverse-engineered driver for nvidia cards
 nvidia - VIDEO_CARDS setting to build driver for nvidia video cards
 nv - VIDEO_CARDS setting to build driver for nv video cards