From 83d5b4132c2e58b573e96c38cce906a6431a0dd5 Mon Sep 17 00:00:00 2001
From: staging-bot <>
Date: May 28 2021 10:33:49 +0000
Subject: Update 000product to rev 2725


https://build.opensuse.org/package/rdiff/openSUSE:Factory/000product?linkrev=base&rev=2725
by user staging-bot
Automatic update

---

diff --git a/.files b/.files
index 5f25f2b..3fa0913 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index cdc2084..fea86d6 100644
--- a/.rev
+++ b/.rev
@@ -19067,4 +19067,11 @@
     <user>staging-bot</user>
     <comment>Automatic update</comment>
   </revision>
+  <revision rev="2725" vrev="2725">
+    <srcmd5>6fe74e6f581073246d98f64a7984e6be</srcmd5>
+    <version>unknown</version>
+    <time>1622197713</time>
+    <user>staging-bot</user>
+    <comment>Automatic update</comment>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index dbcc11e..c32c6d4 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-bac100a4ee223ccb1a3b7002d60f7957
+656e12d3fb93f0907ac26f942dd95339
diff --git a/MicroOS-dvd5-dvd-x86_64.kiwi b/MicroOS-dvd5-dvd-x86_64.kiwi
index 4608737..7de2907 100644
--- a/MicroOS-dvd5-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20210524" schemaversion="4.1">
+<image name="OBS__MicroOS___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210524,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210525,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210524/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210525/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -130,13 +130,14 @@
       <repopackage name="cockpit-system" arch="x86_64"/>
       <repopackage name="colord" arch="x86_64"/>
       <repopackage name="colord-color-profiles" arch="x86_64"/>
+      <repopackage name="compat-usrmerge-tools"/>
       <repopackage name="conmon" arch="x86_64"/>
       <repopackage name="container-selinux" arch="x86_64"/>
       <repopackage name="containers-systemd" arch="x86_64"/>
       <repopackage name="coreutils"/>
       <repopackage name="cpio"/>
       <repopackage name="cpp" arch="x86_64"/>
-      <repopackage name="cpp10" arch="x86_64"/>
+      <repopackage name="cpp11" arch="x86_64"/>
       <repopackage name="cracklib" arch="x86_64"/>
       <repopackage name="cracklib-dict-full" arch="x86_64"/>
       <repopackage name="crda" arch="x86_64"/>
diff --git a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
index 96604a2..d1b375e 100644
--- a/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
+++ b/MicroOS-dvd5-kubic-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__MicroOS___20210524" schemaversion="4.1">
+<image name="OBS__MicroOS___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210524,openSUSE MicroOS</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:microos:20210525,openSUSE MicroOS</productinfo>
       <productinfo name="LINGUAS">en_US </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210524/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/MicroOS/20210525/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -100,6 +100,7 @@
       <repopackage name="cockpit-packagekit" arch="x86_64"/>
       <repopackage name="cockpit-podman" arch="x86_64"/>
       <repopackage name="cockpit-system" arch="x86_64"/>
+      <repopackage name="compat-usrmerge-tools"/>
       <repopackage name="conmon" arch="x86_64"/>
       <repopackage name="conntrack-tools" arch="x86_64"/>
       <repopackage name="container-selinux" arch="x86_64"/>
diff --git a/MicroOS.product b/MicroOS.product
index e32277a..9f5fc87 100644
--- a/MicroOS.product
+++ b/MicroOS.product
@@ -6,7 +6,7 @@
       <name>MicroOS</name>
       <releasepkgname>MicroOS-release</releasepkgname>
       <endoflife/>
-      <version>20210524</version>
+      <version>20210525</version>
       <!-- release is no longer optional -->
       <release>0</release>
       <productline>MicroOS</productline>
diff --git a/dvd.group b/dvd.group
index b5e4ae4..e155d4f 100644
--- a/dvd.group
+++ b/dvd.group
@@ -295,6 +295,7 @@
     <package name="colord-color-profiles" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="colord-gtk-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="colord-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="compat-usrmerge-tools" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="container-selinux" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="coreutils" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="coreutils-doc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
@@ -303,7 +304,7 @@
     <package name="cpio-lang" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="cpio-mt" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="cpp" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
-    <package name="cpp10" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
+    <package name="cpp11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="cppcheck" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="cpupower" supportstatus="unsupported"/> <!-- reason: dvd:patterns-base-console -->
     <package name="cracklib" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
@@ -2380,7 +2381,6 @@
     <package name="libpcre2-16-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libpcre2-32-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libpcre2-8-0" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libpcre2-posix2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="libpcreposix0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-network-network_admin -->
     <package name="libpcsclite1" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libpeas-1_0-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -2643,7 +2643,7 @@
     <package name="libstartup-notification-1-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
     <package name="libstdc++-devel" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="libstdc++6" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
-    <package name="libstdc++6-devel-gcc10" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
+    <package name="libstdc++6-devel-gcc11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde_ide -->
     <package name="libstdc++6-locale" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libstdc++6-pp-gcc11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-kde-kde -->
     <package name="libstoken1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
@@ -5083,9 +5083,9 @@
     <package name="freetype2-devel" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gcc" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gcc-info" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="gcc10" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="gcc10-info" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="gcc10-locale" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="gcc11" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="gcc11-info" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+    <package name="gcc11-locale" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="gdk-pixbuf-query-loaders-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="gettext-tools" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="git-daemon" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
diff --git a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
index b7da006..368a250 100644
--- a/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20210524" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -36,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20210524,openSUSE NonOSS Addon</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20210525,openSUSE NonOSS Addon</productinfo>
       <productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210524/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210524/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210525/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/20210525/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-Addon-NonOss.product b/openSUSE-Addon-NonOss.product
index 439b181..ca41f9b 100644
--- a/openSUSE-Addon-NonOss.product
+++ b/openSUSE-Addon-NonOss.product
@@ -4,7 +4,7 @@
  <product>
         <vendor>openSUSE</vendor>
         <name>openSUSE-Addon-NonOss</name>
-        <version>20210524</version>
+        <version>20210525</version>
         <release>0</release> 
         <summary>openSUSE NonOSS Addon</summary>
         <shortsummary>non oss addon</shortsummary>
diff --git a/openSUSE-cd-mini-i586.kiwi b/openSUSE-cd-mini-i586.kiwi
index 2fb9984..7604288 100644
--- a/openSUSE-cd-mini-i586.kiwi
+++ b/openSUSE-cd-mini-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210524" schemaversion="4.1">
+<image name="OBS__openSUSE___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,11 +32,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210524,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210525,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210524/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210525/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-cd-mini-x86_64.kiwi b/openSUSE-cd-mini-x86_64.kiwi
index b7e8a5f..d5b7582 100644
--- a/openSUSE-cd-mini-x86_64.kiwi
+++ b/openSUSE-cd-mini-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210524" schemaversion="4.1">
+<image name="OBS__openSUSE___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210524,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210525,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210524/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210525/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE-dvd5-dvd-i586.kiwi b/openSUSE-dvd5-dvd-i586.kiwi
index 3f3725f..b3d6ac1 100644
--- a/openSUSE-dvd5-dvd-i586.kiwi
+++ b/openSUSE-dvd5-dvd-i586.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210524" schemaversion="4.1">
+<image name="OBS__openSUSE___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -32,11 +32,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210524,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210525,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210524/i586</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210525/i586</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -294,6 +294,7 @@
       <repopackage name="colord-color-profiles"/>
       <repopackage name="colord-gtk-lang"/>
       <repopackage name="colord-lang"/>
+      <repopackage name="compat-usrmerge-tools"/>
       <repopackage name="container-selinux"/>
       <repopackage name="coreutils"/>
       <repopackage name="coreutils-doc"/>
@@ -302,7 +303,7 @@
       <repopackage name="cpio-lang"/>
       <repopackage name="cpio-mt"/>
       <repopackage name="cpp"/>
-      <repopackage name="cpp10"/>
+      <repopackage name="cpp11"/>
       <repopackage name="cppcheck"/>
       <repopackage name="cpupower"/>
       <repopackage name="cracklib"/>
@@ -2294,7 +2295,6 @@
       <repopackage name="libpcre2-16-0"/>
       <repopackage name="libpcre2-32-0"/>
       <repopackage name="libpcre2-8-0"/>
-      <repopackage name="libpcre2-posix2"/>
       <repopackage name="libpcreposix0"/>
       <repopackage name="libpcsclite1"/>
       <repopackage name="libpeas-1_0-0"/>
@@ -2613,7 +2613,7 @@
       <repopackage name="libstartup-notification-1-0"/>
       <repopackage name="libstdc++-devel"/>
       <repopackage name="libstdc++6"/>
-      <repopackage name="libstdc++6-devel-gcc10"/>
+      <repopackage name="libstdc++6-devel-gcc11"/>
       <repopackage name="libstdc++6-locale"/>
       <repopackage name="libstdc++6-pp-gcc11"/>
       <repopackage name="libstoken1"/>
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index b5b56e4..f9fe2c1 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210524" schemaversion="4.1">
+<image name="OBS__openSUSE___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -35,11 +35,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210524,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210525,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210524/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210525/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
       <productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
@@ -310,6 +310,7 @@
       <repopackage name="colord-color-profiles"/>
       <repopackage name="colord-gtk-lang"/>
       <repopackage name="colord-lang"/>
+      <repopackage name="compat-usrmerge-tools"/>
       <repopackage name="container-selinux"/>
       <repopackage name="CoreFreq-kmp-default" arch="x86_64"/>
       <repopackage name="coreutils"/>
@@ -319,7 +320,7 @@
       <repopackage name="cpio-lang"/>
       <repopackage name="cpio-mt"/>
       <repopackage name="cpp"/>
-      <repopackage name="cpp10"/>
+      <repopackage name="cpp11"/>
       <repopackage name="cppcheck"/>
       <repopackage name="cpupower"/>
       <repopackage name="cracklib"/>
@@ -564,9 +565,9 @@
       <repopackage name="gcal-lang"/>
       <repopackage name="gcc" arch="x86_64"/>
       <repopackage name="gcc-info" arch="x86_64"/>
-      <repopackage name="gcc10" arch="x86_64"/>
-      <repopackage name="gcc10-info" arch="x86_64"/>
-      <repopackage name="gcc10-locale" arch="x86_64"/>
+      <repopackage name="gcc11" arch="x86_64"/>
+      <repopackage name="gcc11-info" arch="x86_64"/>
+      <repopackage name="gcc11-locale" arch="x86_64"/>
       <repopackage name="gcin"/>
       <repopackage name="gcin-branding-openSUSE"/>
       <repopackage name="gcin-gtk2"/>
@@ -2463,7 +2464,6 @@
       <repopackage name="libpcre2-32-0"/>
       <repopackage name="libpcre2-8-0"/>
       <repopackage name="libpcre2-8-0-32bit" arch="x86_64"/>
-      <repopackage name="libpcre2-posix2"/>
       <repopackage name="libpcreposix0"/>
       <repopackage name="libpcsclite1"/>
       <repopackage name="libpeas-1_0-0"/>
@@ -2805,7 +2805,7 @@
       <repopackage name="libstdc++-devel"/>
       <repopackage name="libstdc++6"/>
       <repopackage name="libstdc++6-32bit" arch="x86_64"/>
-      <repopackage name="libstdc++6-devel-gcc10"/>
+      <repopackage name="libstdc++6-devel-gcc11"/>
       <repopackage name="libstdc++6-locale"/>
       <repopackage name="libstdc++6-pp-gcc11"/>
       <repopackage name="libstdc++6-pp-gcc11-32bit" arch="x86_64"/>
diff --git a/openSUSE-ftp-ftp-i586_x86_64.kiwi b/openSUSE-ftp-ftp-i586_x86_64.kiwi
index a198902..1c2e0db 100644
--- a/openSUSE-ftp-ftp-i586_x86_64.kiwi
+++ b/openSUSE-ftp-ftp-i586_x86_64.kiwi
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20210524" schemaversion="4.1">
+<image name="OBS__openSUSE___20210525" schemaversion="4.1">
   <description type="system">
     <author>The SUSE Team</author>
     <contact>build@opensuse.org</contact>
@@ -24,7 +24,7 @@
       <productvar name="DISTNAME">openSUSE</productvar>
       <productvar name="FLAVOR">ftp</productvar>
       <productvar name="MAKE_LISTINGS">true</productvar>
-      <productvar name="MEDIUM_NAME">openSUSE-20210524-i586-x86_64</productvar>
+      <productvar name="MEDIUM_NAME">openSUSE-20210525-i586-x86_64</productvar>
       <productvar name="MULTIPLE_MEDIA">true</productvar>
       <productvar name="PRODUCT_DIR">/</productvar>
       <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
       <productvar name="SEPARATE_MEDIA">true</productvar>
       <productvar name="SHA1OPT">-x -2</productvar>
       <productvar name="VENDOR">openSUSE</productvar>
-      <productvar name="VERSION">20210524</productvar>
+      <productvar name="VERSION">20210525</productvar>
       <productinfo name="CONTENTSTYLE">11</productinfo>
-      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210524,openSUSE Tumbleweed</productinfo>
+      <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20210525,openSUSE Tumbleweed</productinfo>
       <productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
-      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210524/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210524/x86_64</productinfo>
+      <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210525/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20210525/x86_64</productinfo>
       <productinfo name="VENDOR">openSUSE</productinfo>
       <productoption name="DEBUGMEDIUM">2</productoption>
       <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/tumbleweed</productoption>
diff --git a/openSUSE.product b/openSUSE.product
index d5fc912..2777619 100644
--- a/openSUSE.product
+++ b/openSUSE.product
@@ -4,7 +4,7 @@
     <product>
       <vendor>openSUSE</vendor>
       <name>openSUSE</name>
-      <version>20210524</version>
+      <version>20210525</version>
       <release>0</release>
 
       <productline>openSUSE</productline>
diff --git a/opensuse_kubic.group b/opensuse_kubic.group
index acfe9a5..e94ce8b 100644
--- a/opensuse_kubic.group
+++ b/opensuse_kubic.group
@@ -9,6 +9,7 @@
     <package name="busybox-gawk" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-hardware -->
     <package name="busybox-gzip" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="chkstat" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
+    <package name="compat-usrmerge-tools" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="coreutils" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="cpio" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
     <package name="curl" supportstatus="unsupported"/> <!-- reason: opensuse_kubic:patterns-containers-kubeadm -->
diff --git a/opensuse_microos.group b/opensuse_microos.group
index 2de1c8e..3ba5e4a 100644
--- a/opensuse_microos.group
+++ b/opensuse_microos.group
@@ -9,6 +9,7 @@
     <package name="busybox-gawk" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-hardware -->
     <package name="busybox-gzip" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="chkstat" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
+    <package name="compat-usrmerge-tools" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="coreutils" supportstatus="unsupported"/> <!-- reason: opensuse_microos:MicroOS-release -->
     <package name="cpio" supportstatus="unsupported"/> <!-- reason: opensuse_microos:kernel-default -->
     <package name="curl" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-base -->
@@ -238,7 +239,7 @@
     <package name="container-selinux" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-selinux -->
     <package name="containers-systemd" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-containers-container_runtime -->
     <package name="cpp" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
-    <package name="cpp10" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
+    <package name="cpp11" supportstatus="unsupported"/> <!-- reason: opensuse_microos_desktop:patterns-microos-desktop-kde -->
     <package name="cracklib" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="cracklib-dict-full" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
     <package name="crda" supportstatus="unsupported"/> <!-- reason: opensuse_microos:patterns-microos-onlyDVD -->
diff --git a/unsorted.yml b/unsorted.yml
index 281eb65..684af90 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -1117,6 +1117,7 @@ unsorted:
   - bash-completion-doc 
   - bash-devel 
   - bash-git-prompt 
+  - bash-legacybin 
   - bash-loadables 
   - bat 
   - batctl 
@@ -2147,7 +2148,6 @@ unsorted:
   - compartm 
   - compat-usrmerge 
   - compat-usrmerge-build 
-  - compat-usrmerge-tools 
   - compface 
   - compface-devel 
   - compicc 
@@ -2276,7 +2276,7 @@ unsorted:
   - cpanspec 
   - cpluff 
   - cpmono_v07-fonts 
-  - cpp11 
+  - cpp10 
   - cpp7 
   - cpp9 
   - cppcheck-gui 
@@ -3384,7 +3384,6 @@ unsorted:
   - ezstream 
   - f2c 
   - f2c-devel 
-  - f2fs-tools-compat 
   - f2fs-tools-devel 
   - f3 
   - fIcy 
@@ -3938,7 +3937,7 @@ unsorted:
   - gcc-obj-c++ 
   - gcc-objc 
   - gcc-objc-32bit: [x86_64] 
-  - gcc10: [i586] 
+  - gcc10 
   - gcc10-32bit: [x86_64] 
   - gcc10-ada 
   - gcc10-ada-32bit: [x86_64] 
@@ -3951,14 +3950,14 @@ unsorted:
   - gcc10-fortran-32bit: [x86_64] 
   - gcc10-go 
   - gcc10-go-32bit: [x86_64] 
-  - gcc10-info: [i586] 
-  - gcc10-locale: [i586] 
+  - gcc10-info 
+  - gcc10-locale 
   - gcc10-obj-c++ 
   - gcc10-obj-c++-32bit: [x86_64] 
   - gcc10-objc 
   - gcc10-objc-32bit: [x86_64] 
   - gcc10-testresults 
-  - gcc11 
+  - gcc11: [i586] 
   - gcc11-32bit: [x86_64] 
   - gcc11-ada 
   - gcc11-ada-32bit: [x86_64] 
@@ -3971,8 +3970,8 @@ unsorted:
   - gcc11-fortran-32bit: [x86_64] 
   - gcc11-go 
   - gcc11-go-32bit: [x86_64] 
-  - gcc11-info 
-  - gcc11-locale 
+  - gcc11-info: [i586] 
+  - gcc11-locale: [i586] 
   - gcc11-obj-c++ 
   - gcc11-obj-c++-32bit: [x86_64] 
   - gcc11-objc 
@@ -5628,6 +5627,7 @@ unsorted:
   - glibc-locale-base-32bit: [x86_64] 
   - glibc-profile 
   - glibc-profile-32bit: [x86_64] 
+  - glibc-usrmerge-bootstrap-helper 
   - glibc-utils 
   - glibc-utils-32bit: [x86_64] 
   - glibmm2-devel 
@@ -7594,7 +7594,6 @@ unsorted:
   - jupyter-jupyter-client 
   - jupyter-jupyter-contrib-nbextensions 
   - jupyter-jupyter-full-width 
-  - jupyter-jupyter-require 
   - jupyter-jupyter-themer 
   - jupyter-jupyter-wysiwyg 
   - jupyter-jupyter_cms 
@@ -9921,9 +9920,9 @@ unsorted:
   - libcelt-devel-32bit: [x86_64] 
   - libcelt0-2-32bit: [x86_64] 
   - libcelt051-0 
-  - libcephfs-devel: [x86_64] # devel package of dvd:librbd1 
+  - libcephfs-devel: [x86_64] # devel package of dvd:librados2 
   - libcephsqlite: [x86_64] 
-  - libcephsqlite-devel: [x86_64] # devel package of dvd:librbd1 
+  - libcephsqlite-devel: [x86_64] # devel package of dvd:librados2 
   - libceres-devel 
   - libceres2 
   - libcerf-devel 
@@ -12591,6 +12590,7 @@ unsorted:
   - libpcre16-0-32bit: [x86_64] 
   - libpcre2-16-0-32bit: [x86_64] 
   - libpcre2-32-0-32bit: [x86_64] 
+  - libpcre2-posix2 
   - libpcre2-posix2-32bit: [x86_64] 
   - libpcrecpp0 
   - libpcrecpp0-32bit: [x86_64] 
@@ -13077,8 +13077,8 @@ unsorted:
   - librabbitmq-devel 
   - librabbitmq4 
   - libradcli5 
-  - librados-devel: [x86_64] # devel package of dvd:librbd1 
-  - libradospp-devel: [x86_64] # devel package of dvd:librbd1 
+  - librados-devel: [x86_64] # devel package of dvd:librados2 
+  - libradospp-devel: [x86_64] # devel package of dvd:librados2 
   - libraft0 
   - libraptor-devel 
   - libraptor2-0-32bit: [x86_64] 
@@ -13101,7 +13101,7 @@ unsorted:
   - libraw1394-tools 
   - libraw20-32bit: [x86_64] 
   - libraylib351 
-  - librbd-devel: [x86_64] # devel package of dvd:librbd1 
+  - librbd-devel: [x86_64] # devel package of dvd:librados2 
   - librbio2 
   - librbl1 
   - librcc-devel 
@@ -13329,7 +13329,7 @@ unsorted:
   - librevenge-doc 
   - librevenge-generators-0_0-0 
   - librfxencode0 
-  - librgw-devel: [x86_64] # devel package of dvd:librbd1 
+  - librgw-devel: [x86_64] # devel package of dvd:librados2 
   - librhash0 
   - librime-devel 
   - librime-private-devel 
@@ -13672,8 +13672,8 @@ unsorted:
   - libstatgrab10 
   - libstatgrab10-32bit: [x86_64] 
   - libstdc++-devel-32bit: [x86_64] 
+  - libstdc++6-devel-gcc10 
   - libstdc++6-devel-gcc10-32bit: [x86_64] 
-  - libstdc++6-devel-gcc11 
   - libstdc++6-devel-gcc11-32bit: [x86_64] 
   - libstdc++6-devel-gcc7 
   - libstdc++6-devel-gcc7-32bit: [x86_64] 
@@ -14495,7 +14495,7 @@ unsorted:
   - libxcb-composite0-32bit: [x86_64] 
   - libxcb-cursor0-32bit: [x86_64] 
   - libxcb-damage0-32bit: [x86_64] 
-  - libxcb-devel: [i586] # devel package of dvd:libxcb-xinerama0 
+  - libxcb-devel: [i586] # devel package of dvd:libxcb-sync1 
   - libxcb-devel-32bit: [x86_64] 
   - libxcb-devel-doc 
   - libxcb-dpms0-32bit: [x86_64] 
@@ -22746,7 +22746,6 @@ unsorted:
   - python36-jupyter-nbutils 
   - python36-jupyter-packaging 
   - python36-jupyter-protocol 
-  - python36-jupyter-require 
   - python36-jupyter-server 
   - python36-jupyter-server-mathjax 
   - python36-jupyter-sphinx 
@@ -25571,7 +25570,6 @@ unsorted:
   - python38-jupyter-nbutils 
   - python38-jupyter-packaging 
   - python38-jupyter-protocol 
-  - python38-jupyter-require 
   - python38-jupyter-server 
   - python38-jupyter-server-mathjax 
   - python38-jupyter-sphinx 
@@ -27157,6 +27155,7 @@ unsorted:
   - python39-Kajiki 
   - python39-Kivy 
   - python39-Kivy-devel 
+  - python39-LHAPDF 
   - python39-LTTL 
   - python39-Lektor 
   - python39-Levenshtein 
@@ -27244,6 +27243,7 @@ unsorted:
   - python39-Pyphen 
   - python39-Pyro4 
   - python39-QDarkStyle 
+  - python39-QR-Code-generator 
   - python39-Qt.py 
   - python39-QtAwesome 
   - python39-QtPy 
@@ -27378,6 +27378,7 @@ unsorted:
   - python39-apptools 
   - python39-apsw 
   - python39-arabic-reshaper 
+  - python39-archmage 
   - python39-arf 
   - python39-argcomplete 
   - python39-argh 
@@ -28291,6 +28292,7 @@ unsorted:
   - python39-git-url-parse 
   - python39-gitdb 
   - python39-github3.py 
+  - python39-gitlint 
   - python39-glean 
   - python39-glfw 
   - python39-glob2 
@@ -28490,6 +28492,7 @@ unsorted:
   - python39-jaraco.packaging 
   - python39-jaraco.stream 
   - python39-jaraco.text 
+  - python39-javapackages 
   - python39-javaproperties 
   - python39-jdatetime 
   - python39-jdcal 
@@ -28532,6 +28535,7 @@ unsorted:
   - python39-junit-xml 
   - python39-junitxml 
   - python39-junos-eznc 
+  - python39-jupyter 
   - python39-jupyter-client 
   - python39-jupyter-core 
   - python39-jupyter-jupyterlab-server 
@@ -28615,9 +28619,11 @@ unsorted:
   - python39-libarchive 
   - python39-libarchive-c 
   - python39-libcst 
+  - python39-libkdumpfile 
   - python39-liblarch 
   - python39-liblarch-gtk 
   - python39-libnacl 
+  - python39-libpfm 
   - python39-librosa 
   - python39-librouteros 
   - python39-libsass 
@@ -28634,7 +28640,9 @@ unsorted:
   - python39-lineup-widget 
   - python39-link-traits 
   - python39-linstor 
+  - python39-linstor-client 
   - python39-linux-procfs 
+  - python39-lit 
   - python39-llvmlite 
   - python39-lmdb 
   - python39-lmfit 
@@ -28699,6 +28707,7 @@ unsorted:
   - python39-mimesis 
   - python39-minidb 
   - python39-minio 
+  - python39-miniupnpc 
   - python39-misaka 
   - python39-mistune 
   - python39-mitmproxy 
@@ -28975,7 +28984,9 @@ unsorted:
   - python39-pip-api 
   - python39-pip-licenses 
   - python39-pip-shims 
+  - python39-pip-test 
   - python39-pip-tools 
+  - python39-pip-wheel 
   - python39-pipdeptree 
   - python39-pipreqs 
   - python39-pipx 
@@ -29096,6 +29107,7 @@ unsorted:
   - python39-pyblake2 
   - python39-pybluez 
   - python39-pybtex 
+  - python39-pybugz 
   - python39-pycairo 
   - python39-pycairo-devel 
   - python39-pycapnp 
@@ -29602,6 +29614,7 @@ unsorted:
   - python39-sadisplay 
   - python39-samplerate 
   - python39-sane 
+  - python39-sanlock 
   - python39-sarge 
   - python39-sas7bdat 
   - python39-sasl 
@@ -29648,6 +29661,7 @@ unsorted:
   - python39-setuptools 
   - python39-setuptools-declarative-requirements 
   - python39-setuptools-git 
+  - python39-setuptools-test 
   - python39-setuptools-version-command 
   - python39-setuptools-wheel 
   - python39-setuptools_scm 
@@ -29803,6 +29817,7 @@ unsorted:
   - python39-tabpy 
   - python39-tabulate 
   - python39-tap.py 
+  - python39-targetcli-fb 
   - python39-tasklib 
   - python39-tbb 
   - python39-tblib 
@@ -29904,6 +29919,7 @@ unsorted:
   - python39-txWS 
   - python39-txZMQ 
   - python39-txaio 
+  - python39-txt2tags 
   - python39-txtorcon 
   - python39-typed-ast 
   - python39-typeguard 
@@ -29986,6 +30002,7 @@ unsorted:
   - python39-w3lib 
   - python39-wadllib 
   - python39-waitress 
+  - python39-waitress-doc 
   - python39-wakeonlan 
   - python39-warlock 
   - python39-watchdog 
@@ -30110,6 +30127,7 @@ unsorted:
   - python39-zstandard 
   - python39-zstd 
   - python39-zxcvbn 
+  - python39-zypp-plugin 
   - pytorch-converters: [x86_64] 
   - pytorch-examples: [x86_64] 
   - pyzo 
@@ -30556,7 +30574,7 @@ unsorted:
   - radcli-devel 
   - radeontop 
   - radeontop-lang 
-  - rados-objclass-devel: [x86_64] # devel package of dvd:librbd1 
+  - rados-objclass-devel: [x86_64] # devel package of dvd:librados2 
   - raft-devel 
   - rage 
   - ragel 
@@ -31487,7 +31505,6 @@ unsorted:
   - scrub 
   - scrypt 
   - scs-devel 
-  - scsh 
   - scsh-base 
   - scsirastools 
   - scsires 
@@ -41682,6 +41699,7 @@ unsorted:
   - ws-jaxme-manual 
   - wsdl4j 
   - wsdl4j-javadoc 
+  - wsl-appx 
   - wslay 
   - wslay-devel 
   - wsmancli