drop some unused stuff

2 files changed, 0 insertions, 41 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 646d08a..f6321fb 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -78,18 +78,6 @@ $o = {
                #- !TYPE"64bit" packages are selected by default for live
                #- skip i586 ones if not relevant
                'libqca1-tls',
-
-               if_($ENV{DRAKLIVE_REGION} eq 'Asia-no-India',
-            	    'ibus-table-wubi',
-               ),
-               if_($ENV{DRAKLIVE_REGION} eq 'Europe2', 
-            	    'pidgin-plugins', 'kscd', 'tvtime',
-            	    'plasma-applet-system-monitor-cpu', 'plasma-applet-system-monitor-hdd',
-            	    'plasma-applet-system-monitor-hwinfo', 'plasma-applet-system-monitor-net',
-            	    'plasma-applet-system-monitor-temperature', 'python-kde4', 'plasma-scriptengine-python',
-            	    'imagemagick', 'kipi-plugins-batchprocess', 'kipi-plugins-dngconverter',
-            	    'fonts-ttf-decoratives',
-               ),
                '/^lib64atlas3-/',
            ),
 	    if_($ENV{DRAKLIVE_ARCH} eq 'i586',
@@ -125,9 +113,6 @@ $o = {
                'kipi-plugins-expoblending', # pulls in hugin
                'enblend',
 
-               if_($ENV{DRAKLIVE_REGION} eq 'Asia-no-India',
-                   'imagemagick', 'kipi-plugins-batchprocess'),
-
                if_($ENV{DRAKLIVE_LANGS} !~ /\bpt\b/ && $ENV{DRAKLIVE_REGION} ne 'all',
                    #- do not install pt translations if only pt_BR is explicitely selected
                    'kde-l10n-pt', 'firefox-pt_PT', 'libreoffice-langpack-pt_PT', 'myspell-pt_PT',
@@ -266,31 +251,11 @@ $o = {
 	   'mageia-doc-mcc-en', 'bind-utils', 'mdadm', 'dmraid',
 	   
 	   if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ),
-	   
-           #- live resize/install/copy tools
-           if_($ENV{DRAKLIVE_MEDIA} eq 'usb', 'draklive-resize'),
-
-           if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
 
            if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',),
 
            if_($has_kde4, 'kcm_touchpad',),
 
-           if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
-               'samba-client',
-               'RealPlayer', 'RealPlayer-rpnp',
-               'java-1.6.0-sun',
-               'mozilla-firefox-ext-google-toolbar',
-               'filezilla', #- FIXME: bump to level 5 in rpmsrate?
-               'nut-server',
-               'thunderbird',
-               if_($ENV{DRAKLIVE_REGION} eq 'all', map { "thunderbird-$_" } qw(ca cs de el es es_AR eu fi fr gu_IN he hu it ja ko nb nl pa_IN pl pt_BR ru sk sl sv tr zh_CN)),
-               if_($ENV{DRAKLIVE_PRODUCT} =~ /guadec/i,
-                   'fonts-ttf-gurmukhi',
-                   'cheese',
-                   'anjuta',
-               ),
-           ),
        ],
        'preferred_packages' => join(',', $has_kde4 ? 'kdm' : 'gdm'),
        'meta_class' => 'desktop',
diff --git a/config/live.cfg b/config/live.cfg
index 71ece5e..324e941 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -72,12 +72,6 @@ my $_l = {
                 [ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
                 # livecd specific initrd
                 [ 'files/live-dracut.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ],
-                # live media harddrake
-#                [ 'files/harddrake2/kernel', '/etc/sysconfig/harddrake2/kernel', { mode => 0644 } ],
-#                [ 'files/harddrake2/service.conf', '/etc/sysconfig/harddrake2/service.conf', { mode => 0644, no_install => 1 } ],
-#                [ 'files/harddrake2/mandrake_everytime', '/etc/rc.d/init.d/mandrake_everytime', { mode => 0755 } ],
-#                [ 'files/harddrake2/services.pm', '/usr/lib/libDrakX/services.pm', { mode => 0644 } ],
-#                [ 'files/harddrake2/display_driver_helper', '/usr/sbin/display_driver_helper', { mode => 0755 } ],
             ),
             #- disable first boot wizard at live boot
             [ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],