Merge branch 'master' of ssh://git.fedorahosted.org/git/comps

comps-f19.xml.in

@@ -432,6 +432,9 @@
       <packagereq>xscreensaver-base</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>blueman</packagereq>
@@ -1391,7 +1394,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">aeolus-all</packagereq>
       <packagereq type="optional">ceph</packagereq>
       <packagereq type="optional">deltacloud-core-all</packagereq>
       <packagereq type="optional">euca2ools</packagereq>
@@ -4368,6 +4370,7 @@
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
       <packagereq>desktop-backgrounds-basic</packagereq>
@@ -4405,10 +4408,10 @@
    </group>
    <group>
     <id>mate-compiz</id>
-    <_name>mate-compiz</_name>
+    <_name>MATE COMPIZ</_name>
     <_description>This package group adds Compiz and Emerald to MATE desktop</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
        <packagereq>compiz</packagereq>
        <packagereq>compiz-plugins-main</packagereq>
@@ -4422,6 +4425,7 @@
        <packagereq>compiz-plugins-main</packagereq>
        <packagereq>ccsm</packagereq>
        <packagereq>emerald-themes</packagereq>
+       <packagereq>emerald-themes-extra</packagereq>
        <packagereq>emerald</packagereq>
        <packagereq>fusion-icon</packagereq>
        <packagereq>fusion-icon-gtk</packagereq>
@@ -6297,6 +6301,7 @@
       <groupid>mate-desktop</groupid>
     </grouplist>
     <optionlist>
+      <groupid>mate-compiz</groupid>
       <groupid>libreoffice</groupid>
       <groupid>3d-printing</groupid>
     </optionlist>
@@ -6540,6 +6545,7 @@
     <display_order>22</display_order>
     <grouplist>
       <groupid>mate-desktop</groupid>
+      <groupid>mate-compiz</groupid>
     </grouplist>
   </category>
   <category>

comps-f20.xml.in

@@ -438,6 +438,9 @@
       <packagereq>xscreensaver-base</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
@@ -916,6 +919,7 @@
       <packagereq>rubygem-hike</packagereq>
       <packagereq>rubygem-i18n</packagereq>
       <packagereq>rubygem-io-console</packagereq>
+      <packagereq>rubygem-jbuilder</packagereq>
       <packagereq>rubygem-journey</packagereq>
       <packagereq>rubygem-jquery-rails</packagereq>
       <packagereq>rubygem-json</packagereq>
@@ -952,6 +956,7 @@
       <packagereq>rubygem-thor</packagereq>
       <packagereq>rubygem-tilt</packagereq>
       <packagereq>rubygem-treetop</packagereq>
+      <packagereq>rubygem-turbolinks</packagereq>
       <packagereq>rubygem-tzinfo</packagereq>
       <packagereq>rubygem-uglifier</packagereq>
       <packagereq>ruby-irb</packagereq>
@@ -1382,7 +1387,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">aeolus-all</packagereq>
       <packagereq type="optional">ceph</packagereq>
       <packagereq type="optional">deltacloud-core-all</packagereq>
       <packagereq type="optional">euca2ools</packagereq>
@@ -1813,6 +1817,33 @@
       <packagereq type="optional">yasm</packagereq>
       <packagereq type="optional">zzuf</packagereq>
     </packagelist>
+    </group>
+    <group>
+    <id>d-development</id>
+    <_name>D Development Tools and Libraries</_name>
+    <_description>These include development tools and lib such as ldc, geany-tag  .</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq basearchonly="true" type="mandatory">ldc</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-druntime-devel</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-phobos-devel</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-druntime</packagereq>
+      <packagereq type="mandatory">make</packagereq>
+      <packagereq type="mandatory">pkgconfig</packagereq>
+      <packagereq type="default">ctags</packagereq>
+      <packagereq type="default">indent</packagereq>
+      <packagereq type="optional">astyle</packagereq>
+      <packagereq type="optional">cmake</packagereq>
+      <packagereq type="optional">insight</packagereq>
+      <packagereq type="optional">nemiver</packagereq>
+      <packagereq type="optional">uncrustify</packagereq>
+      <packagereq type="optional">geany</packagereq>
+      <packagereq type="optional">syntastic-d</packagereq>
+      <packagereq type="optional">gl3n-devel</packagereq>
+      <packagereq type="optional">derelict-devel</packagereq>
+      <packagereq type="optional">tango-devel</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>dial-up</id>
@@ -4340,6 +4371,7 @@
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>NetworkManager</packagereq>
       <packagereq>claws-mail</packagereq>
       <packagereq>dconf-editor</packagereq>
@@ -4360,7 +4392,7 @@
       <packagereq>hexchat</packagereq>
       <packagereq>initial-setup</packagereq>
       <packagereq>libmatekbd</packagereq>
-      <packagereq>libmatekeyring</packagereq>
+      <packagereq>libsecret</packagereq>
       <packagereq>libmatenotify</packagereq>
       <packagereq>libmateweather</packagereq>
       <packagereq>libmatewnck</packagereq>
@@ -4381,8 +4413,6 @@
       <packagereq>mate-file-manager</packagereq>
       <packagereq>mate-icon-theme</packagereq>
       <packagereq>mate-image-viewer</packagereq>
-      <packagereq>mate-keyring-pam</packagereq>
-      <packagereq>mate-keyring</packagereq>
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menu-editor</packagereq>
       <packagereq>mate-menus-preferences-category-menu</packagereq>
@@ -4423,7 +4453,7 @@
     <_name>MATE Applications</_name>
     <_description>Applications for the MATE Desktop.</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
       <packagereq>bluedevil</packagereq>
       <packagereq>caja-actions</packagereq>
@@ -4442,7 +4472,6 @@
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
       <packagereq>xfburn</packagereq>
-      <packagereq>xterm</packagereq>
     </packagelist>
    </group>
    <group>
@@ -4450,7 +4479,7 @@
     <_name>mate-compiz</_name>
     <_description>This package group adds Compiz and Emerald to MATE desktop</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
        <packagereq>compiz</packagereq>
        <packagereq>compiz-plugins-main</packagereq>
@@ -4464,6 +4493,7 @@
        <packagereq>compiz-plugins-main</packagereq>
        <packagereq>ccsm</packagereq>
        <packagereq>emerald-themes</packagereq>
+       <packagereq>emerald-themes-extra</packagereq>
        <packagereq>emerald</packagereq>
        <packagereq>fusion-icon</packagereq>
        <packagereq>fusion-icon-gtk</packagereq>
@@ -6589,6 +6619,7 @@
     <grouplist>
       <groupid>mate-desktop</groupid>
       <groupid>mate-applications</groupid>
+      <groupid>mate-compiz</groupid>
     </grouplist>
   </category>
   <category>

comps-f21.xml.in

@@ -120,6 +120,7 @@
       <packagereq>gnome-photos</packagereq>
       <packagereq>gnome-screenshot</packagereq>
       <packagereq>gnome-software</packagereq>
+      <packagereq>gnome-sound-recorder</packagereq>
       <packagereq>gnome-system-log</packagereq>
       <packagereq>gnome-system-monitor</packagereq>
       <packagereq>gnome-terminal</packagereq>
@@ -248,7 +249,7 @@
       <packagereq>cups-pk-helper</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>gwenview</packagereq>
-      <packagereq>initial-setup</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
       <packagereq>kamera</packagereq>
       <packagereq>kamoso</packagereq>
       <packagereq>kcalc</packagereq>
@@ -286,7 +287,7 @@
       <packagereq>ksnapshot</packagereq>
       <packagereq>ksshaskpass</packagereq>
       <packagereq>ksysguard</packagereq>
-      <packagereq>kwallet</packagereq>
+      <packagereq>kwalletmanager</packagereq>
       <packagereq>kwebkitpart</packagereq>
       <packagereq>kwrite</packagereq>
       <packagereq>okular</packagereq>
@@ -423,7 +424,7 @@
       <packagereq>lightdm-gtk</packagereq>
       <packagereq>gtk-xfce-engine</packagereq>
       <packagereq>gvfs</packagereq>
-      <packagereq>initial-setup</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>nm-connection-editor</packagereq>
       <packagereq>openssh-askpass</packagereq>
@@ -440,6 +441,9 @@
       <packagereq>xscreensaver-base</packagereq>
       <packagereq>yumex</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
+      <packagereq>NetworkManager-l2tp</packagereq>
+      <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
@@ -575,7 +579,7 @@
       <packagereq>pcmanfm</packagereq>
       <packagereq>firewall-config</packagereq>
       <packagereq>gpicview</packagereq>
-      <packagereq>initial-setup</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
       <packagereq>leafpad</packagereq>
       <packagereq>lxappearance</packagereq>
       <packagereq>lxappearance-obconf</packagereq>
@@ -686,7 +690,7 @@
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>gnome-icon-theme-symbolic</packagereq>
       <packagereq>i3</packagereq>
-      <packagereq>initial-setup</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
       <packagereq>lightdm</packagereq>
       <packagereq>metacity</packagereq>
       <packagereq>openbox</packagereq>
@@ -718,7 +722,7 @@
       <packagereq>lightdm-gtk</packagereq>
       <packagereq>xdg-user-dirs-gtk</packagereq>
       <packagereq>gedit</packagereq>
-      <packagereq>initial-setup</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
       <packagereq>imsettings-cinnamon</packagereq>
       <packagereq>nemo-fileroller</packagereq>
       <packagereq>nemo-preview</packagereq>
@@ -918,6 +922,7 @@
       <packagereq>rubygem-hike</packagereq>
       <packagereq>rubygem-i18n</packagereq>
       <packagereq>rubygem-io-console</packagereq>
+      <packagereq>rubygem-jbuilder</packagereq>
       <packagereq>rubygem-journey</packagereq>
       <packagereq>rubygem-jquery-rails</packagereq>
       <packagereq>rubygem-json</packagereq>
@@ -946,6 +951,7 @@
       <packagereq>rubygem-ruby_parser</packagereq>
       <packagereq>rubygem-sass</packagereq>
       <packagereq>rubygem-sass-rails</packagereq>
+      <packagereq>rubygem-sdoc</packagereq>
       <packagereq>rubygem-sexp_processor</packagereq>
       <packagereq>rubygem-sinatra</packagereq>
       <packagereq>rubygem-sprockets</packagereq>
@@ -954,6 +960,7 @@
       <packagereq>rubygem-thor</packagereq>
       <packagereq>rubygem-tilt</packagereq>
       <packagereq>rubygem-treetop</packagereq>
+      <packagereq>rubygem-turbolinks</packagereq>
       <packagereq>rubygem-tzinfo</packagereq>
       <packagereq>rubygem-uglifier</packagereq>
       <packagereq>ruby-irb</packagereq>
@@ -1115,7 +1122,6 @@
     <langonly>as</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-assamese-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-bengali-fonts</packagereq>
@@ -1170,7 +1176,7 @@
       <packagereq type="optional">xmlcopyeditor</packagereq>
     </packagelist>
   </group>
-  <group>
+	  <group>
     <id>standard</id>
     <_name>Standard</_name>
     <_description>Common set of utilities that extend the minimal installation.</_description>
@@ -1198,7 +1204,6 @@
       <packagereq>pciutils</packagereq>
       <packagereq>psacct</packagereq>
       <packagereq>quota</packagereq>
-      <packagereq>tmpwatch</packagereq>
       <packagereq>traceroute</packagereq>
       <packagereq type="conditional" requires="control-center">chrony</packagereq>
       <packagereq>bash-completion</packagereq>
@@ -1285,7 +1290,6 @@
     <langonly>bn</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-bengali-fonts</packagereq>
@@ -1313,7 +1317,6 @@
     <langonly>brx</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
@@ -1385,7 +1388,6 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="optional">aeolus-all</packagereq>
       <packagereq type="optional">ceph</packagereq>
       <packagereq type="optional">deltacloud-core-all</packagereq>
       <packagereq type="optional">euca2ools</packagereq>
@@ -1816,6 +1818,33 @@
       <packagereq type="optional">yasm</packagereq>
       <packagereq type="optional">zzuf</packagereq>
     </packagelist>
+  </group>
+    <group>
+    <id>d-development</id>
+    <_name>D Development Tools and Libraries</_name>
+    <_description>These include development tools and lib such as ldc, geany-tag  .</_description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq basearchonly="true" type="mandatory">ldc</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-druntime-devel</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-phobos-devel</packagereq>
+      <packagereq basearchonly="true" type="mandatory">ldc-druntime</packagereq>
+      <packagereq type="mandatory">make</packagereq>
+      <packagereq type="mandatory">pkgconfig</packagereq>
+      <packagereq type="default">ctags</packagereq>
+      <packagereq type="default">indent</packagereq>
+      <packagereq type="optional">astyle</packagereq>
+      <packagereq type="optional">cmake</packagereq>
+      <packagereq type="optional">insight</packagereq>
+      <packagereq type="optional">nemiver</packagereq>
+      <packagereq type="optional">uncrustify</packagereq>
+      <packagereq type="optional">geany</packagereq>
+      <packagereq type="optional">syntastic-d</packagereq>
+      <packagereq type="optional">gl3n-devel</packagereq>
+      <packagereq type="optional">derelict-devel</packagereq>
+      <packagereq type="optional">tango-devel</packagereq>
+    </packagelist>
   </group>
   <group>
     <id>dial-up</id>
@@ -1884,7 +1913,6 @@
     <langonly>doi</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
@@ -2485,12 +2513,12 @@
       <packagereq type="default">lohit-devanagari-fonts</packagereq>
       <packagereq type="default">lohit-gujarati-fonts</packagereq>
       <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-oriya-fonts</packagereq>
-      <packagereq type="default">lohit-punjabi-fonts</packagereq>
+      <packagereq type="default">lohit-odia-fonts</packagereq>
+      <packagereq type="default">lohit-gurmukhi-fonts</packagereq>
       <packagereq type="default">lohit-tamil-fonts</packagereq>
       <packagereq type="default">lohit-telugu-fonts</packagereq>
       <packagereq type="default">nhn-nanum-gothic-fonts</packagereq>
-      <packagereq type="default">paktype-naqsh-fonts</packagereq>
+      <packagereq type="default">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="default">paratype-pt-sans-fonts</packagereq>
       <packagereq type="default">sil-abyssinica-fonts</packagereq>
       <packagereq type="default">sil-mingzat-fonts</packagereq>
@@ -2572,6 +2600,7 @@
       <packagereq type="optional">ecolier-court-lignes-fonts</packagereq>
       <packagereq type="optional">extremetuxracer-papercuts-fonts</packagereq>
       <packagereq type="optional">extremetuxracer-papercuts-outline-fonts</packagereq>
+      <packagereq type="optional">fontawesome-fonts</packagereq>
       <packagereq type="optional">freecol-imperator-fonts</packagereq>
       <packagereq type="optional">freecol-shadowedblack-fonts</packagereq>
       <packagereq type="optional">gargi-fonts</packagereq>
@@ -2768,9 +2797,10 @@
       <packagereq type="optional">oflb-smonohand-fonts</packagereq>
       <packagereq type="optional">oflb-sportrop-fonts</packagereq>
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
+      <packagereq type="optional">open-sans-fonts</packagereq>
       <packagereq type="optional">pagul-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-fonts</packagereq>
+      <packagereq type="optional">paktype-naqsh-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
@@ -3525,7 +3555,6 @@
     <langonly>gu</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-gujarati-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-gujarati-fonts</packagereq>
@@ -3541,7 +3570,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="default">aic94xx-firmware</packagereq>
       <packagereq type="default">alsa-firmware</packagereq>
       <packagereq type="default">atmel-firmware</packagereq>
       <packagereq type="default">b43-fwcutter</packagereq>
@@ -3647,7 +3675,6 @@
     <langonly>hi</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -3685,7 +3712,6 @@
       <packagereq type="default">ibus-typing-booster</packagereq>
       <packagereq type="default">im-chooser</packagereq>
       <packagereq type="default">imsettings</packagereq>
-      <packagereq type="default">m17n-contrib</packagereq>
       <packagereq type="optional">cellwriter</packagereq>
       <packagereq type="optional">eekboard</packagereq>
       <packagereq type="optional">fcitx</packagereq>
@@ -3885,7 +3911,6 @@
     <langonly>kn</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-kannada-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">gubbi-fonts</packagereq>
@@ -3904,7 +3929,6 @@
     <langonly>ks</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
@@ -4112,6 +4136,7 @@
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">ghostscript-fonts</packagereq>
+      <packagereq type="optional">google-android-emoji-fonts</packagereq>
       <packagereq type="optional">iso8859-2-100dpi-fonts</packagereq>
       <packagereq type="optional">iso8859-2-75dpi-fonts</packagereq>
       <packagereq type="optional">iso8859-2-misc-fonts</packagereq>
@@ -4200,7 +4225,6 @@
     <langonly>lep</langonly>
     <packagelist>
       <packagereq type="mandatory">sil-mingzat-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -4265,7 +4289,6 @@
     <langonly>mai</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
@@ -4280,7 +4303,6 @@
     <uservisible>false</uservisible>
     <langonly>ml</langonly>
     <packagelist>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="mandatory">smc-meera-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
@@ -4306,7 +4328,6 @@
     <langonly>mni</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-bengali-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -4320,50 +4341,48 @@
     <packagelist>
       <packagereq>abrt-desktop</packagereq>
       <packagereq>abrt-java-connector</packagereq>
+      <packagereq>atril-caja</packagereq>
+      <packagereq>atril</packagereq>
+      <packagereq>caja</packagereq>
+      <packagereq>caja-beesu</packagereq>
+      <packagereq>caja-image-converter</packagereq>
+      <packagereq>caja-open-terminal</packagereq>
+      <packagereq>caja-sendto</packagereq>
       <packagereq>claws-mail</packagereq>
-      <packagereq>dconf</packagereq>
       <packagereq>dconf-editor</packagereq>
+      <packagereq>dconf</packagereq>
       <packagereq>desktop-backgrounds-basic</packagereq>
+      <packagereq>engrampa</packagereq>
+      <packagereq>eom</packagereq>
       <packagereq>fedora-icon-theme</packagereq>
       <packagereq>firefox</packagereq>
       <packagereq>firewall-config</packagereq>
-      <packagereq>gnome-software</packagereq>
+      <packagereq>gtk2-engines</packagereq>
+      <packagereq>gvfs-afc</packagereq>
+      <packagereq>gvfs-archive</packagereq>
+      <packagereq>gvfs-fuse</packagereq>
+      <packagereq>gvfs-gphoto2</packagereq>
+      <packagereq>gvfs-mtp</packagereq>
       <packagereq>gvfs</packagereq>
       <packagereq>gvfs-smb</packagereq>
-      <packagereq>gvfs-fuse</packagereq>
-      <packagereq>gvfs-afc</packagereq>
-      <packagereq>gvfs-mtp</packagereq>
-      <packagereq>gvfs-gphoto2</packagereq>
-      <packagereq>gtk2-engines</packagereq>
       <packagereq>hexchat</packagereq>
-      <packagereq>initial-setup</packagereq>
+      <packagereq>initial-setup-gui</packagereq>
       <packagereq>libmatekbd</packagereq>
-      <packagereq>libmatekeyring</packagereq>
-      <packagereq>libmatenotify</packagereq>
       <packagereq>libmateweather</packagereq>
-      <packagereq>libmatewnck</packagereq>
-      <packagereq>lightdm</packagereq>
+      <packagereq>libsecret</packagereq>
       <packagereq>lightdm-gtk</packagereq>
+      <packagereq>lightdm</packagereq>
+      <packagereq>marco</packagereq>
       <packagereq>mate-applets</packagereq>
-      <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-backgrounds</packagereq>
       <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
-      <packagereq>mate-character-map</packagereq>
       <packagereq>mate-desktop</packagereq>
       <packagereq>mate-dialogs</packagereq>
-      <packagereq>atril</packagereq>
-      <packagereq>atril-caja</packagereq>
-      <packagereq>mate-file-archiver</packagereq>
-      <packagereq>caja</packagereq>
-      <packagereq>mate-file-manager-image-converter</packagereq>
-      <packagereq>mate-file-manager-sendto</packagereq>
-      <packagereq>mate-file-manager-open-terminal</packagereq>
       <packagereq>mate-icon-theme</packagereq>
-      <packagereq>mate-image-viewer</packagereq>
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menus</packagereq>
-      <packagereq>mate-menu-editor</packagereq>
+      <packagereq>mate-menus-preferences-category-menu</packagereq>
       <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-notification-daemon</packagereq>
       <packagereq>mate-panel</packagereq>
@@ -4377,18 +4396,18 @@
       <packagereq>mate-system-log</packagereq>
       <packagereq>mate-system-monitor</packagereq>
       <packagereq>mate-terminal</packagereq>
-      <packagereq>mate-text-editor</packagereq>
       <packagereq>mate-themes</packagereq>
-      <packagereq>mate-window-manager</packagereq>
-      <packagereq>NetworkManager</packagereq>
+      <packagereq>mozo</packagereq>
       <packagereq>network-manager-applet</packagereq>
       <packagereq>NetworkManager-l2tp</packagereq>
       <packagereq>NetworkManager-openconnect</packagereq>
       <packagereq>NetworkManager-openvpn</packagereq>
+      <packagereq>NetworkManager</packagereq>
       <packagereq>NetworkManager-pptp</packagereq>
       <packagereq>NetworkManager-vpnc</packagereq>
-      <packagereq>pavucontrol</packagereq>
+      <packagereq>NetworkManager-vpnc-gnome</packagereq>
       <packagereq>pidgin</packagereq>
+      <packagereq>pluma</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>system-config-language</packagereq>
@@ -4405,23 +4424,28 @@
     <_name>MATE Applications</_name>
     <_description>Applications for the MATE Desktop.</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
+      <packagereq>bluedevil</packagereq>
+      <packagereq>caja-actions</packagereq>
+      <packagereq>caja-share</packagereq>
+      <packagereq>caja-terminal</packagereq>
       <packagereq>geany</packagereq>
       <packagereq>filezilla</packagereq>
+      <packagereq>firewall-applet</packagereq>
       <packagereq>mate-applet-lockkeys</packagereq>
       <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-dictionary</packagereq>
       <packagereq>mate-disk-usage-analyzer</packagereq>
       <packagereq>mate-file-manager-share</packagereq>
       <packagereq>mate-icon-theme-faenza</packagereq>
-      <packagereq>mate-menus-preferences-category-menu</packagereq>
       <packagereq>mate-netspeed</packagereq>
       <packagereq>mate-sensors-applet</packagereq>
       <packagereq>mate-user-share</packagereq>
       <packagereq>mate-utils</packagereq>
       <packagereq>mintmenu</packagereq>
-      <packagereq>pidgin</packagereq>
+      <packagereq>pavucontrol</packagereq>
+      <packagereq>python-caja</packagereq>
       <packagereq>tigervnc</packagereq>
       <packagereq>vim-enhanced</packagereq>
       <packagereq>xterm</packagereq>
@@ -4429,10 +4453,10 @@
    </group>
    <group>
     <id>mate-compiz</id>
-    <_name>mate-compiz</_name>
+    <_name>MATE COMPIZ</_name>
     <_description>This package group adds Compiz and Emerald to MATE desktop</_description>
     <default>false</default>
-    <uservisible>false</uservisible>
+    <uservisible>true</uservisible>
     <packagelist>
        <packagereq>compiz</packagereq>
        <packagereq>compiz-plugins-main</packagereq>
@@ -4446,6 +4470,7 @@
        <packagereq>compiz-plugins-main</packagereq>
        <packagereq>ccsm</packagereq>
        <packagereq>emerald-themes</packagereq>
+       <packagereq>emerald-themes-extra</packagereq>
        <packagereq>emerald</packagereq>
        <packagereq>fusion-icon</packagereq>
        <packagereq>fusion-icon-gtk</packagereq>
@@ -4460,7 +4485,6 @@
     <langonly>mr</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-marathi-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
@@ -4591,7 +4615,6 @@
     <langonly>ne</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">madan-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="optional">scim-tables-nepali</packagereq>
@@ -4809,8 +4832,7 @@
     <uservisible>false</uservisible>
     <langonly>or</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-oriya-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
+      <packagereq type="mandatory">lohit-odia-fonts</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -4891,8 +4913,7 @@
     <uservisible>false</uservisible>
     <langonly>pa</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-punjabi-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
+      <packagereq type="mandatory">lohit-gurmukhi-fonts</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -5024,7 +5045,6 @@
     <langonly>sat</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-ui-fonts</packagereq>
@@ -5045,6 +5065,7 @@
       <packagereq type="default">aircrack-ng</packagereq>
       <packagereq type="default">airsnort</packagereq>
       <packagereq type="default">argus</packagereq>
+      <packagereq type="default">argus-clients</packagereq>
       <packagereq type="default">arp-scan</packagereq>
       <packagereq type="default">bannergrab</packagereq>
       <packagereq type="default">binwalk</packagereq>
@@ -5066,7 +5087,6 @@
       <packagereq type="default">echoping</packagereq>
       <packagereq type="default">etherape</packagereq>
       <packagereq type="default">ettercap</packagereq>
-      <packagereq type="default">ettercap-gtk</packagereq>
       <packagereq type="default">examiner</packagereq>
       <packagereq type="default">firewalk</packagereq>
       <packagereq type="default">firstaidkit-gui</packagereq>
@@ -5074,17 +5094,20 @@
       <packagereq type="default">flawfinder</packagereq>
       <packagereq type="default">foremost</packagereq>
       <packagereq type="default">fping</packagereq>
+      <packagereq type="default">goaccess</packagereq>
       <packagereq type="default">gparted</packagereq>
       <packagereq type="default">halberd</packagereq>
       <packagereq type="default">hexedit</packagereq>
       <packagereq type="default">hfsutils</packagereq>
-      <packagereq type="default">honeyd</packagereq>
       <packagereq type="default">horst</packagereq>
       <packagereq type="default">hping3</packagereq>
       <packagereq type="default">ht</packagereq>
+      <packagereq type="default">httpie</packagereq>
       <packagereq type="default">httping</packagereq>
       <packagereq type="default">httpry</packagereq>
+      <packagereq type="default">httrack</packagereq>
       <packagereq type="default">hunt</packagereq>
+      <packagereq type="default">hydra</packagereq>
       <packagereq type="default">iftop</packagereq>
       <packagereq type="default">inception</packagereq>
       <packagereq type="default">iperf</packagereq>
@@ -5095,8 +5118,10 @@
       <packagereq type="default">kismon</packagereq>
       <packagereq type="default">labrea</packagereq>
       <packagereq type="default">lbd</packagereq>
+      <packagereq type="default">lnav</packagereq>
       <packagereq type="default">lynis</packagereq>
       <packagereq type="default">macchanger</packagereq>
+      <packagereq type="default">masscan</packagereq>
       <packagereq type="default">mausezahn</packagereq>
       <packagereq type="default">mc</packagereq>
       <packagereq type="default">mcabber</packagereq>
@@ -5110,9 +5135,12 @@
       <packagereq type="default">ncrack</packagereq>
       <packagereq type="default">nebula</packagereq>
       <packagereq type="default">net-snmp</packagereq>
+      <packagereq type="default">net-snmp-utils</packagereq>
+      <packagereq type="default">netactview</packagereq>
       <packagereq type="default">nethogs</packagereq>
       <packagereq type="default">netsed</packagereq>
       <packagereq type="default">netsniff-ng</packagereq>
+      <packagereq type="default">nfswatch</packagereq>
       <packagereq type="default">ngrep</packagereq>
       <packagereq type="default">nikto</packagereq>
       <packagereq type="default">nload</packagereq>
@@ -5122,8 +5150,10 @@
       <packagereq type="default">ntfs-3g</packagereq>
       <packagereq type="default">ntfsprogs</packagereq>
       <packagereq type="default">ntop</packagereq>
+      <packagereq type="default">ntp</packagereq>
       <packagereq type="default">nwipe</packagereq>
       <packagereq type="default">onesixtyone</packagereq>
+      <packagereq type="default">openssh</packagereq>
       <packagereq type="default">openvas-client</packagereq>
       <packagereq type="default">openvas-scanner</packagereq>
       <packagereq type="default">ophcrack</packagereq>
@@ -5140,6 +5170,7 @@
       <packagereq type="default">prewikka</packagereq>
       <packagereq type="default">proxychains</packagereq>
       <packagereq type="default">pscan</packagereq>
+      <packagereq type="default">pwgen</packagereq>
       <packagereq type="default">pyrit</packagereq>
       <packagereq type="default">raddump</packagereq>
       <packagereq type="default">ratproxy</packagereq>
@@ -5172,14 +5203,17 @@
       <packagereq type="default">sslscan</packagereq>
       <packagereq type="default">sslsplit</packagereq>
       <packagereq type="default">sslstrip</packagereq>
+      <packagereq type="default">subnetcalc</packagereq>
       <packagereq type="default">sucrack</packagereq>
       <packagereq type="default">swaks</packagereq>
+      <packagereq type="default">tcpcopy</packagereq>
       <packagereq type="default">tcpdump</packagereq>
       <packagereq type="default">tcpflow</packagereq>
       <packagereq type="default">tcpick</packagereq>
       <packagereq type="default">tcpjunk</packagereq>
       <packagereq type="default">tcpreen</packagereq>
       <packagereq type="default">tcpreplay</packagereq>
+      <packagereq type="default">tcptrack</packagereq>
       <packagereq type="default">tcpxtract</packagereq>
       <packagereq type="default">telnet</packagereq>
       <packagereq type="default">testdisk</packagereq>
@@ -5196,11 +5230,12 @@
       <packagereq type="default">wget</packagereq>
       <packagereq type="default">whois</packagereq>
       <packagereq type="default">wipe</packagereq>
-      <packagereq type="default">wireshark-gnome</packagereq>
+      <packagereq type="default">wireshark</packagereq>
       <packagereq type="default">xmount</packagereq>
       <packagereq type="default">xprobe2</packagereq>
       <packagereq type="default">yersinia</packagereq>
       <packagereq type="default">yum-utils</packagereq>
+      <packagereq type="default">zmap</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5256,7 +5291,6 @@
     <langonly>sd</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-devanagari-fonts</packagereq>
@@ -5273,7 +5307,6 @@
     <langonly>si</langonly>
     <packagelist>
       <packagereq type="mandatory">lklug-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-sayura</packagereq>
@@ -5335,6 +5368,7 @@
       <packagereq type="optional">festvox-rms-arctic-hts</packagereq>
       <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
+      <packagereq type="optional">gnome-sound-recorder</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
       <packagereq type="optional">gnomeradio</packagereq>
       <packagereq type="optional">grip</packagereq>
@@ -5716,7 +5750,6 @@
     <langonly>ta</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-tamil-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-tamil-fonts</packagereq>
@@ -5735,7 +5768,6 @@
     <langonly>te</langonly>
     <packagelist>
       <packagereq type="mandatory">lohit-telugu-fonts</packagereq>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
       <packagereq type="mandatory">m17n-db</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">google-noto-sans-telugu-fonts</packagereq>
@@ -5876,8 +5908,7 @@
     <uservisible>false</uservisible>
     <langonly>ur</langonly>
     <packagelist>
-      <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="mandatory">paktype-naqsh-fonts</packagereq>
+      <packagereq type="mandatory">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="mandatory">paktype-tehreer-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
@@ -5905,7 +5936,7 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-fonts</packagereq>
+      <packagereq type="optional">paktype-naqsh-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6571,6 +6602,7 @@
     <grouplist>
       <groupid>mate-desktop</groupid>
       <groupid>mate-applications</groupid>
+      <groupid>mate-compiz</groupid>
     </grouplist>
   </category>
   <category>

comps.dtd

@@ -1,11 +1,14 @@
 <?xml encoding="UTF-8"?>
 
-<!ELEMENT comps (group+,category+)>
+<!ELEMENT comps (group+,environment+,category+,langpacks?)>
 <!ATTLIST comps xmlns CDATA #FIXED ''>
 
 <!ELEMENT group (id,name,description,default,uservisible,langonly?, packagelist)>
 <!ATTLIST group xmlns CDATA #FIXED ''>
 
+<!ELEMENT environment (id,name,description,display_order?,grouplist,optionlist)>
+<!ATTLIST environment xmlns CDATA #FIXED ''>
+
 <!ELEMENT category (id,name,description,display_order?,grouplist)>
 <!ATTLIST category xmlns CDATA #FIXED ''>
 
@@ -41,3 +44,6 @@
 
 <!ELEMENT description (#PCDATA)>
 <!ATTLIST description xmlns CDATA #FIXED ''>
+
+<!ELEMENT optionlist (groupid)+>
+<!ATTLIST optionlist xmlns CDATA #FIXED ''>

comps.rng

@@ -20,6 +20,9 @@
       <oneOrMore>
         <ref name="group"/>
       </oneOrMore>
+      <zeroOrMore>
+        <ref name="environment"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="category"/>
       </zeroOrMore>
@@ -120,6 +123,22 @@
       <ref name="packagename"/>
     </element>
   </define>
+  <define name="environment">
+    <element name="environment">
+      <interleave>
+      <ref name="id"/>
+      <optional>
+        <element name="display_order">
+          <ref name="positiveInteger"/>
+        </element>
+      </optional>
+      <ref name="grouplist"/>
+      <optional>
+        <ref name="optionlist"/>
+      </optional>
+     </interleave>
+    </element>
+  </define>
   <define name="category">
     <element name="category">
       <interleave>
@@ -140,6 +159,13 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="optionlist">
+    <element name="optionlist">
+      <oneOrMore>
+        <ref name="groupid"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="groupid">
     <element name="groupid">
       <ref name="string"/>