auto_inst.cfg.pl: clean a lot of old stuff and sort

1 files changed, 81 insertions, 120 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 3836021..7a889ed 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -58,140 +58,101 @@ $o = {
        # so that rpmsrate flags are really used
        'compssListLevel' => 5, # default from install_steps_interactive
        'skipped_packages' => [
-	   #- do not allow source dkms to be installed
-           'dkms',
-	   'aspell',
-	   'aspell-en',
 
-	   'denemo', # pulls in lilypond and texlive
-
-	   # no devel packages on live media
-	   'glibc-devel', 'gdb', 'gcc',
-
-	   # pulls in devel deps
-	   'empathy',
-
-	   # not needed on live medias
-	   'virtuoso-opensource',
-
-	   # theese fonts adds 20-30 sec delay / font on initial execution of
-	   # fontconfig cache wich is _way_ too painful on live boot (mga#17223)
-	   'fonts-otf-source-han', '/^google-noto/',
-
-           if_($ENV{DRAKLIVE_ARCH} eq 'x86_64',
-               #- !TYPE"64bit" packages are selected by default for live
-               #- skip i586 ones if not relevant
-               'libqca1-tls',
-               '/^lib64atlas3-/',
-           ),
-
-           if_($ENV{DRAKLIVE_ARCH} eq 'i586',
-	        '/^libatlas3-/',
+	    # i586 arch specific
+	    if_($ENV{DRAKLIVE_ARCH} eq 'i586',
+		'/^kernel-desktop-/', '/^vboxadditions-kernel-4\.6\.3-desktop-/',
+		'/^libatlas3-/',
 	    ),
 
-           if_($ENV{DRAKLIVE_PRODUCT} !~ /gaming/i, #- non-DVD products
-               #- from task-kde Suggests
-               #- skipping them prevents task-kde from being installed,
-               #- but its dependencies seems to be pulled correctly
-               'kde-wallpapers',
-               '/-handbooks?-/', 'konsole-doc', #- KDE doc
-               'kdeaddons',
-               'kdenlive',
-               'kdepim-kpilot',
-
-               # need space on kde disks
-               'kdepim-core', 'kaddressbook', 'knode', 'knotes', 'kontact', 'korganizer',
-               'kipi-plugins-piwigoexport', 'kipi-plugins-kopete', 'kipi-plugins-panorama', 'kipi-plugins-vkontakte',
-               'kipi-plugins-yandexfotki', 'kipi-plugins-smug', 'kipi-plugins-shwup', 'kipi-plugins-flashexport',
-               'kopete',
-               'kipi-plugins-expoblending', # pulls in hugin
-               'enblend',
-
-               'task-printing-scanning',
-               'qtradio', 'kradio',
-	       'system-config-printer',
-               'poppler-data', 'tetex',
-               '/^gimp-help/',
-               '/^libreoffice-help/',
-               'libreoffice-base',
-               if_($has_plasma5,
-                   'liblm_sensors3', 'xpdf-common', 'htdig', 'mirrordir', 'acr38u',
-                   'ekiga',
-                   'kdeaccessibility4',
-                   if_(!$has_gnome, 'gnome-media', 'yelp', 'pinentry-gtk2', 'polkit-gnome', 'seahorse', 'totem-mozilla',
-                	'gnome-packagekit-common', 'gnome-keyring',
-                   ),
-               ),
-               
-               'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader',
-               'drakfax', 'efax',
-           ),
-           if_($ENV{DRAKLIVE_PRODUCT} !~ /gaming/i,
-               #- from task-kde Suggests
-               'kdegames', 'kdegames4',
-               'kdetoys',
-           ),
-           if_(!$ENV{DRAKLIVE_COMMERCIAL},
-               'skype',
-           ),
-
-           #- bluez-pin provide
-           if_(!$has_plasma5, 'bluedevil'),# 'plasma-applet-kimpanel-backend-ibus'),
-
-           if_(!$has_plasma5, 'pinentry-qt4'), #- qt4 app
-           '/noatun/', #- prefer amarok
-	   'rxvt',
+            # x86_64 arch specific
+            if_($ENV{DRAKLIVE_ARCH} eq 'x86_64',
+                '/^lib64atlas3-/',
+            ),
 
-           if_($has_gnome, 'beagle', 'inkscape'),
+            # block core stuff
+            '/^kernel-server-/', '/^vboxadditions-kernel-4\.6\.3-server-/', # no server kernels
+            'grub', 'lilo', # no legacy bootloaders, we default to grub2
 
-           'mono',
+	    # no devel packages on live media
+	    'glibc-devel', 'gdb', 'gcc', 'dkms',
+	    'empathy', # pulls devel stuff
 
-	   # block the kernels we dont want
-	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^vboxadditions-kernel-4\.6\.3-desktop-/'),
-           '/^kernel-server-/', '/^vboxadditions-kernel-4\.6\.3-server-/',
+	    # theese fonts adds 20-30 sec delay / font on initial execution of
+	    # fontconfig cache wich is _way_ too painful on live boot (mga#17223)
+	    'fonts-otf-source-han', '/^google-noto/',
 
            # shipped in live nonfree
 	   '/^broadcom-wl-/',
            'broadcom-bcma-config', 'broadcom-ssb-config',
 
-	   # not needed anymore (mga #2001)
-	   'nspluginwrapper',
-	   'nspluginwrapper-i386',
-
-           #- no distribution license
-           'flash-player-plugin',
-           
-           # xguest sucks
-           'xguest', 'apper',
-           
-           # not wanted (mga #9752)
-           'al-anvar',
-           
-           # broken
-           'audacity',
-           
-           #  not wanted
-           'mate-polkit',
-
+	    # huge deps
+	    'denemo', # pulls in lilypond and texlive
+	    'virtuoso-opensource', # not needed on live media
+            'mono', # bloat
+
+	    # old stuff
+	    'aspell', 'aspell-en',
+	    'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader',
+            'drakfax', 'efax', 'rxvt',
+            'nspluginwrapper','nspluginwrapper-i386', # not needed anymore (mga #2001)
+
+    	    # broken stuff
+            'audacity', 'xguest', 'apper',
+
+            # not wanted
+            'al-anvar', #  (mga #9752)
+            'mate-polkit',
+
+            #- no distribution license
+            'flash-player-plugin',
+
+            # Gnome specific stuff
+            if_($has_gnome,
+        	'beagle', 'inkscape',
+        	'bluedevil', #- bluez-pin provide
+        	'pinentry-qt4', #- qt4 app
+        	'/noatun/', #- prefer amarok
+            ),
+
+            # Plasma specific stuff
+            if_($has_plasma5,
+            ),
        ],
-       'default_packages' => [
-           if_($has_plasma5, "$distro_config-plasma5-config"),
-           if_($has_lxde, "mageia-lxde-config-$distro_release"),
-           if_($has_xfce, "mageia-xfce-config-$distro_release"),
-
-	   'x11-server-common', 'x11-driver-video-vboxvideo',
-	   'basesystem', 'x11-driver-video', 'x11-driver-input',
-	   'bluez-firmware', 'mageiawelcome',
-	   'usbutils', # we want lsusb
-	   'shared-mime-info', # needed for .desktop files to work atleast in gnome
-	   'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch',
-	   'mageia-doc-mcc-en', 'bind-utils', 'mdadm', 'dmraid',
-
-	   if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', '/^locales-/'),
-
-           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session', 'hexchat'),
 
+       'default_packages' => [
+            if_($has_plasma5, "$distro_config-plasma5-config"),
+            if_($has_lxde, "mageia-lxde-config-$distro_release"),
+            if_($has_xfce, "mageia-xfce-config-$distro_release"),
+
+	    # try to protect base packages from rpmlib/urpmi cascade bug
+	    'basesystem', 'x11-server-common','x11-driver-video', 'x11-driver-input',
+	    'x11-driver-video-vboxvideo',
+	    
+	    # utils wanted
+	    'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch',
+	    'bind-utils', 'mdadm', 'dmraid', 'usbutils', # we want lsusb
+	    'shared-mime-info', # needed for .desktop files to work atleast in gnome
+	    'vim-enhanced', # full ediitor
+
+	    'bluez-firmware', # missed firmware
+
+	    # mageia specific
+	    'mageiawelcome', # nice helper app
+	    'mageia-doc-mcc-en', # some nice docs
+
+            # Gnome specific stuff
+            if_($has_gnome,
+        	'task-gnome', 'gdm', # sometimes gets nuked during build
+        	'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session', 'hexchat',
+            ),
+
+            # Plasma specific stuff
+            if_($has_plasma5,
+        	'task-plasma5', 'sddm', # sometimes gets nuked during build
+            ),
        ],
+
        'preferred_packages' => join(',', $has_plasma5 ? 'sddm' : 'gdm'),
        'meta_class' => 'desktop',
        'desktop' => first(@desktops),