Revert "- Drop cheese"

This reverts commit a5a5fcd582.

comps-aarch64.xml

@@ -5949,7 +5949,7 @@
       <packagereq variant="AppStream" type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group variant="Devel">
+  <group variant="AppStream">
     <id>gnome-apps</id>
     <name>GNOME Applications</name>
     <name xml:lang="as">GNOME এপ্লিকেচনসমূহ</name>
@@ -6007,8 +6007,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Devel" type="mandatory">brasero</packagereq>
-      <packagereq variant="Devel" type="mandatory">brasero-nautilus</packagereq>
+      <packagereq variant="AppStream" type="mandatory">brasero</packagereq>
+      <packagereq variant="AppStream" type="mandatory">brasero-nautilus</packagereq>
     </packagelist>
   </group>
   <group variant="BaseOS">
@@ -6175,6 +6175,7 @@
       <packagereq variant="AppStream" type="mandatory">at-spi2-core</packagereq>
       <packagereq variant="AppStream" type="mandatory">avahi-tools</packagereq>
       <packagereq variant="AppStream" type="mandatory">baobab</packagereq>
+      <packagereq variant="AppStream" type="mandatory">cheese</packagereq>
       <packagereq variant="AppStream" type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq variant="AppStream" type="mandatory">dconf</packagereq>
       <packagereq variant="AppStream" type="mandatory">eog</packagereq>
@@ -6439,6 +6440,7 @@
       <packagereq variant="Server" type="mandatory">avahi-tools</packagereq>
       <packagereq variant="Server" type="mandatory">baobab</packagereq>
       <packagereq variant="Server" type="mandatory">celluloid</packagereq>
+      <packagereq variant="Server" type="mandatory">cheese</packagereq>
       <packagereq variant="Server" type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq variant="Server" type="mandatory">dconf</packagereq>
       <packagereq variant="Server" type="mandatory">eog</packagereq>
@@ -11567,7 +11569,7 @@
       <packagereq variant="Minimal" type="default">NetworkManager-wwan</packagereq>
     </packagelist>
   </group>
-  <group variant="Devel">
+  <group variant="AppStream">
     <id>office-suite</id>
     <name>Office Suite and Productivity</name>
     <name xml:lang="as">কাৰ্যালয় গোট আৰু কাৰ্য্যক্ষমতা</name>
@@ -11632,17 +11634,17 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Devel" type="default">libreoffice-calc</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-draw</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-emailmerge</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-graphicfilter</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-impress</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-math</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-writer</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-base</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-ogltrans</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-pyuno</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-wiki-publisher</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-calc</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-draw</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-emailmerge</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-graphicfilter</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-impress</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-math</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-writer</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-base</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-ogltrans</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-pyuno</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-wiki-publisher</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -17501,60 +17503,12 @@
       <groupid>standard</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
-    <optionlist>
-      <groupid>backup-client</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>internet-applications</groupid>
-      <groupid>internet-browser-firefox</groupid>
-      <groupid>remote-desktop-clients</groupid>
-      <groupid>smart-card</groupid>
-    </optionlist>
-  </environment>
-  <environment variant="Devel">
-    <id>workstation-product-environment</id>
-    <name>Workstation</name>
-    <name xml:lang="de">Arbeitsplatz</name>
-    <name xml:lang="es">Estación de trabajo</name>
-    <name xml:lang="fr">Station de travail</name>
-    <name xml:lang="it">Postazione di lavoro</name>
-    <name xml:lang="ja">ワークステーション</name>
-    <name xml:lang="ko">워크스테이션</name>
-    <name xml:lang="pt_BR">Workstation</name>
-    <name xml:lang="ru">Рабочая станция</name>
-    <name xml:lang="zh_CN">工作站</name>
-    <name xml:lang="zh_TW">工作站</name>
-    <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
-    <description xml:lang="de">Workstation ist ein benutzerfreundliches Desktop-System für Laptops und PCs.</description>
-    <description xml:lang="es">Workstation es un sistema de escritorio fácil de usar para ordenadores portátiles y PC.</description>
-    <description xml:lang="fr">Une station de travail est un système de bureau convivial pour les ordinateurs portables et les PC.</description>
-    <description xml:lang="it">Workstation è un sistema desktop di facile utilizzo per computer portatili e PC.</description>
-    <description xml:lang="ja">ノートパソコンおよび PC 向けのユーザーフレンドリーなデスクト>ップシステムです。</description>
-    <description xml:lang="ko">워크스테이션은 사용자 친화적인 랩탑 및 PC 용 데스크탑 시스템>입니다.</description>
-    <description xml:lang="pt">Workstation é um sistema de desktop amigável para laptops e PCs.</description>
-    <description xml:lang="pt_BR">Workstation é um sistema de desktop amigável para laptops e PCs.</description>
-    <description xml:lang="ru">Рабочая станция - это удобная для пользователя настольная система для ноутбуков и ПК.</description>
-    <description xml:lang="zh_CN">工作站是用户友好的笔记本电脑和 PC 的桌面系统。</description>
-    <description xml:lang="zh_TW">Workstation是一款面向筆記本電腦和PC的用戶友好型桌面系統。</description>
-    <display_order>4</display_order>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>core</groupid>
-      <groupid>fonts</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>internet-browser</groupid>
-      <groupid>multimedia</groupid>
-      <groupid>networkmanager-submodules</groupid>
-      <groupid>print-client</groupid>
-      <groupid>standard</groupid>
-      <groupid>workstation-product</groupid>
-    </grouplist>
     <optionlist>
       <groupid>backup-client</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-applications</groupid>
+      <groupid>internet-browser-firefox</groupid>
       <groupid>office-suite</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
@@ -18203,8 +18157,10 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
+      <groupid>gnome-apps</groupid>
       <groupid>graphics</groupid>
       <groupid>internet-applications</groupid>
+      <groupid>office-suite</groupid>
     </grouplist>
   </category>
   <category>

variants-aarch64.xml

@@ -72,6 +72,7 @@
       <group default="false">file-server</group>
       <group default="false">fonts</group>
       <group default="false">ftp-server</group>
+      <group default="false">gnome-apps</group>
       <group default="false">gnome-desktop</group>
       <group default="false">graphical-admin-tools</group>
       <group default="false">graphics</group>
@@ -92,6 +93,7 @@
       <group default="false">network-server</group>
       <group default="false">network-tools</group>
       <group default="false">networkmanager-submodules</group>
+      <group default="false">office-suite</group>
       <group default="false">ostree-support</group>
       <group default="false">performance</group>
       <group default="false">platform-devel</group>
@@ -278,14 +280,9 @@
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">gnome-apps</group>
-      <group default="false">office-suite</group>
+      <group default="false">additional-devel</group>
       <group default="false">platform-vmware</group>
     </groups>
-    <environments>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>