[molecules] move common graphic env packages into a separate module

This commit is contained in:
Fabio Erculiani
2013-01-05 10:57:28 +00:00
parent 398ff94f44
commit 64e0bd08ed
10 changed files with 123 additions and 185 deletions
+3 -15
View File
@@ -47,36 +47,24 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# List of packages that would be removed from chrooted system (comma separated)
# packages_to_remove:
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
packages_to_add:
@X,
app-editors/gedit,
app-emulation/virtualbox-guest-additions,
app-misc/anaconda-runtime-gui,
app-misc/sabayon-skel,
app-text/epdfview,
app-text/pastebunz,
dev-python/libgnomecanvas-python,
gnome-extra/nm-applet-gtk2,
lxde-base/lxdm,
media-fonts/corefonts,
media-fonts/dejavu,
media-gfx/feh,
media-fonts/ttf-bitstream-vera,
media-plugins/alsa-plugins,
net-dialup/ppp,
net-dialup/rp-pppoe,
net-irc/xchat,
sys-power/cpufrequtils,
sys-apps/gpu-detector,
sys-block/parted,
www-client/chromium,
x11-apps/setxkbmap,
x11-apps/xhost,
x11-drivers/xf86-video-virtualbox,
x11-terms/xterm,
x11-themes/equinox-themes,
x11-themes/gtk-engines:2,
x11-themes/hicolor-icon-theme,
x11-wm/awesome
# Determine whether repositories update should be run (if packages_to_add is set)
+6 -23
View File
@@ -38,47 +38,30 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh CoreCDX
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
# sabayon-skel required to make anaconda autostart
# libgnomecanvas-python required by anaconda
# x11-drivers/xf86-video-virtualbox#2.6.33-sabayon,
# x11-libs/libXxf86misc required by xset
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
# x11-drivers/xf86-video-virtualbox#2.6.33-sabayon,
packages_to_add:
@X,
@fluxbox,
@wireless,
app-emulation/virtualbox-guest-additions,
app-misc/sabayon-skel,
app-misc/anaconda-runtime-gui,
app-emulation/virtualbox-guest-additions,
app-text/pastebunz,
dev-python/libgnomecanvas-python,
lxde-base/lxdm,
media-fonts/ttf-bitstream-vera,
media-fonts/dejavu,
media-fonts/corefonts,
media-gfx/feh,
net-dialup/ppp,
net-dialup/rp-pppoe,
net-misc/tightvnc,
sys-apps/gpu-detector,
sys-block/parted,
sys-power/cpufrequtils,
x11-apps/xhost,
x11-apps/setxkbmap,
x11-themes/equinox-themes,
x11-themes/gtk-engines:2,
x11-drivers/ati-drivers,
x11-drivers/nvidia-drivers,
x11-drivers/xf86-video-virtualbox,
x11-libs/libXxf86misc,
x11-themes/hicolor-icon-theme,
x11-terms/xterm
x11-drivers/xf86-video-virtualbox
# Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no.
+62 -62
View File
@@ -38,7 +38,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/xfceforensic_pre_iso_script.sh
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
@@ -46,87 +46,87 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# List of packages that would be removed from chrooted system (comma separated )
packages_to_remove:
app-dicts/aspell-de,
app-dicts/aspell-fr,
app-dicts/aspell-it,
app-dicts/aspell-nl,
app-dicts/aspell-pl,
app-dicts/myspell-de,
app-dicts/myspell-es,
app-dicts/myspell-fr,
app-dicts/myspell-it,
app-dicts/myspell-nl,
app-misc/sabayon-music,
mail-client/mailx,
mail-client/mailx-support,
net-p2p/transmission-base,
net-p2p/transmission-gtk,
www-client/midori,
x11-wm/fluxbox,
media-gfx/shotwell,
net-firewall/ufw,
net-firewall/ufw-frontends,
games-misc/cowsay,
app-editors/gedit
app-dicts/aspell-de,
app-dicts/aspell-fr,
app-dicts/aspell-it,
app-dicts/aspell-nl,
app-dicts/aspell-pl,
app-dicts/myspell-de,
app-dicts/myspell-es,
app-dicts/myspell-fr,
app-dicts/myspell-it,
app-dicts/myspell-nl,
app-misc/sabayon-music,
mail-client/mailx,
mail-client/mailx-support,
net-p2p/transmission-base,
net-p2p/transmission-gtk,
www-client/midori,
x11-wm/fluxbox,
media-gfx/shotwell,
net-firewall/ufw,
net-firewall/ufw-frontends,
games-misc/cowsay,
app-editors/gedit
# List of packages that would be added from chrooted system (comma separated)
packages_to_add:
app-admin/testdisk,
app-antivirus/clamav,
app-antivirus/clamav,
app-antivirus/clamtk,
app-arch/xarchiver,
app-cdr/xfburn,
app-forensics/magicrescue,
app-forensics/cmospwd,
app-forensics/rkhunter,
app-forensics/sleuthkit,
app-forensics/autopsy,
app-arch/xarchiver,
app-cdr/xfburn,
app-forensics/magicrescue,
app-forensics/cmospwd,
app-forensics/rkhunter,
app-forensics/sleuthkit,
app-forensics/autopsy,
app-forensics/mac-robber,
app-forensics/aide,
app-forensics/rdd,
app-forensics/aide,
app-forensics/rdd,
app-crypt/chntpw,
app-crypt/fcrackzip,
app-crypt/fcrackzip,
app-crypt/johntheripper,
app-crypt/gifshuffle,
app-crypt/pdfcrack,
app-misc/screen,
dev-util/geany,
dev-util/geany-plugins,
gnome-extra/nm-applet,
dev-vcs/git,
app-crypt/pdfcrack,
app-misc/screen,
dev-util/geany,
dev-util/geany-plugins,
gnome-extra/nm-applet,
dev-vcs/git,
net-analyzer/traceroute,
net-libs/libnet,
net-libs/libnet,
net-libs/netwib,
net-misc/knock,
media-fonts/droid,
net-misc/knock,
media-fonts/droid,
media-gfx/picasa,
media-gfx/pqstego,
media-gfx/pqstego,
media-sound/pavucontrol,
media-video/vlc,
net-analyzer/nmap,
net-analyzer/netcat6,
net-irc/irssi,
net-analyzer/wireshark,
net-analyzer/tcpdump,
net-analyzer/nmap,
net-analyzer/netcat6,
net-irc/irssi,
net-analyzer/wireshark,
net-analyzer/tcpdump,
net-misc/dropbox,
net-wireless/aircrack-ng,
sys-apps/mlocate,
net-wireless/aircrack-ng,
sys-apps/mlocate,
sys-apps/gnome-disk-utility,
sys-block/gparted,
sys-block/gparted,
sys-fs/extundelete,
www-client/chromium,
x11-libs/xcb-util-image,
x11-libs/xcb-util-keysyms,
x11-libs/xcb-util-wm,
x11-terms/terminator,
x11-misc/pcmanfm,
x11-wm/awesome,
xfce-extra/thunar-volman,
xfce-extra/tumbler
www-client/chromium,
x11-libs/xcb-util-image,
x11-libs/xcb-util-keysyms,
x11-libs/xcb-util-wm,
x11-terms/terminator,
x11-misc/pcmanfm,
x11-wm/awesome,
xfce-extra/thunar-volman,
xfce-extra/tumbler
# Custom shell call to packages add (default is: equo install)
# custom_packages_add_cmd:
# custom_packages_add_cmd:
# Custom command for updating repositories (default is: equo update)
# repositories_update_cmd:
+5 -15
View File
@@ -38,7 +38,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh GNOME
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
@@ -47,10 +47,11 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# List of packages that would be removed from chrooted system (comma separated)
# packages_to_remove:
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
# List of packages that would be added from chrooted system (comma separated)
packages_to_add:
@X,
@fluxbox,
@gnome,
@gst-plugins,
@gst-plugins-extra,
@@ -79,12 +80,9 @@ packages_to_add:
app-editors/gedit,
app-emulation/virtualbox-guest-additions,
app-emulation/wine,
app-laptop/nvidiabl,
app-misc/anaconda-runtime-gui,
app-misc/gnote,
app-misc/sabayon-mce,
app-misc/sabayon-music,
app-misc/sabayon-skel,
app-misc/sabayon-version,
app-office/libreoffice,
app-office/libreoffice-l10n-de,
@@ -112,9 +110,6 @@ packages_to_add:
gnome-extra/nautilus-sendto,
gnome-extra/nm-applet,
gnome-extra/polkit-gnome,
media-fonts/corefonts,
media-fonts/dejavu,
media-fonts/ttf-bitstream-vera,
media-gfx/gimp,
media-gfx/shotwell,
media-libs/libdvdcss,
@@ -151,7 +146,6 @@ packages_to_add:
net-wireless/bluez-hcidump,
net-wireless/gnome-bluetooth,
sys-apps/gnome-disk-utility,
sys-apps/gpu-detector,
sys-apps/hdparm,
sys-apps/sdparm,
sys-apps/tuxonice-userui,
@@ -175,12 +169,8 @@ packages_to_add:
x11-misc/xvkbd,
x11-terms/gnome-terminal,
x11-terms/guake,
x11-terms/xterm,
x11-themes/gnome-icon-theme,
x11-themes/gnome-themes,
x11-themes/gtk-engines,
x11-themes/hicolor-icon-theme,
x11-themes/iottinka-artwork,
x11-themes/sabayon-artwork-extra,
x11-themes/sabayon-artwork-gnome,
x11-themes/sabayon-artwork-loo,
@@ -189,7 +179,7 @@ packages_to_add:
x11-wm/twm
# Custom shell call to packages add (default is: equo install)
# custom_packages_add_cmd:
# custom_packages_add_cmd:
# Custom command for updating repositories (default is: equo update)
# repositories_update_cmd:
+26
View File
@@ -0,0 +1,26 @@
# This module contains packages that images shipping with X.Org should have
# sabayon-skel required to make anaconda autostart
# libgnomecanvas-python required by anaconda
# x11-libs/libXxf86misc required by xset
packages_to_add:
@X,
@fluxbox,
app-laptop/nvidiabl,
app-misc/sabayon-skel,
app-misc/anaconda-runtime-gui,
dev-python/libgnomecanvas-python,
media-fonts/ttf-bitstream-vera,
media-fonts/dejavu,
media-fonts/corefonts,
sys-apps/gpu-detector,
sys-power/bbswitch,
x11-apps/xhost,
x11-apps/setxkbmap,
x11-themes/equinox-themes,
x11-themes/gtk-engines:2,
x11-themes/hicolor-icon-theme,
x11-themes/iottinka-artwork,
x11-terms/xterm,
x11-libs/libXxf86misc,
x11-misc/bumblebee
+4 -17
View File
@@ -38,42 +38,29 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh HardenedServer
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
packages_to_add:
@X,
@fluxbox,
@xfce,
app-admin/rigo,
app-misc/sabayon-skel,
app-misc/anaconda-runtime-gui,
app-text/pastebunz,
dev-python/libgnomecanvas-python,
lxde-base/lxdm,
media-fonts/ttf-bitstream-vera,
media-fonts/dejavu,
media-fonts/corefonts,
media-gfx/feh,
net-dialup/ppp,
net-dialup/rp-pppoe,
net-misc/tightvnc,
sys-apps/gpu-detector,
sys-block/parted,
sys-power/cpufrequtils,
x11-apps/xhost,
x11-apps/setxkbmap,
x11-themes/equinox-themes,
x11-themes/gtk-engines:2,
x11-libs/libXxf86misc,
x11-themes/gnome-themes-standard,
x11-themes/hicolor-icon-theme,
x11-themes/equinox-themes,
x11-terms/xfce4-terminal,
x11-terms/xterm,
sys-kernel/linux-hardened,
sys-apps/paxctl,
www-client/midori
+4 -13
View File
@@ -38,7 +38,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh KDE
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
@@ -47,10 +47,11 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# List of packages that would be removed from chrooted system (comma separated)
# packages_to_remove:
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
# List of packages that would be added from chrooted system (comma separated)
packages_to_add:
@X,
@fluxbox,
@gst-plugins,
@gst-plugins-extra,
@wireless,
@@ -74,8 +75,6 @@ packages_to_add:
app-dicts/myspell-nl,
app-emulation/virtualbox-guest-additions,
app-emulation/wine,
app-laptop/nvidiabl,
app-misc/anaconda-runtime-gui,
app-misc/sabayon-mce,
app-misc/sabayon-music,
app-misc/sabayon-skel,
@@ -266,9 +265,6 @@ packages_to_add:
kde-misc/networkmanagement,
kde-misc/synaptiks,
kde-misc/yakuake,
media-fonts/corefonts,
media-fonts/dejavu,
media-fonts/ttf-bitstream-vera,
media-libs/libdvdcss,
media-libs/libdvdnav,
media-libs/libdvdplay,
@@ -297,7 +293,6 @@ packages_to_add:
net-wireless/bluez,
net-wireless/bluez-firmware,
net-wireless/bluez-hcidump,
sys-apps/gpu-detector,
sys-apps/hdparm,
sys-apps/sdparm,
sys-apps/tuxonice-userui,
@@ -320,14 +315,10 @@ packages_to_add:
x11-drivers/xf86-video-virtualbox,
x11-libs/libva-vdpau-driver,
x11-libs/xvba-video,
x11-misc/bumblebee,
x11-misc/desktop-acceleration-helpers,
x11-misc/xvkbd,
x11-terms/xterm,
x11-themes/gnome-themes-standard,
x11-themes/gtk-engines-qtcurve,
x11-themes/gtk-engines:2,
x11-themes/iottinka-artwork,
x11-themes/oxygen-gtk:2,
x11-themes/oxygen-gtk:3,
x11-themes/sabayon-artwork-extra,
+4 -13
View File
@@ -38,7 +38,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh LXDE
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
@@ -48,11 +48,12 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
packages_to_remove:
www-client/lynx
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
# List of packages that would be added from chrooted system (comma separated)
packages_to_add:
@X,
@lxde,
@fluxbox,
@wireless,
app-admin/rigo,
app-arch/xarchiver,
@@ -60,39 +61,29 @@ packages_to_add:
app-crypt/pinentry-gtk2,
app-editors/leafpad,
app-emulation/virtualbox-guest-additions,
app-misc/anaconda-runtime-gui,
app-office/abiword,
app-office/gnumeric,
app-text/epdfview,
app-text/pastebunz,
games-misc/cowsay,
gnome-extra/nm-applet-gtk2,
lxde-base/lxpolkit,
media-fonts/ttf-bitstream-vera,
media-fonts/dejavu,
media-fonts/corefonts,
media-plugins/alsa-plugins,
media-sound/audacious,
net-dialup/rp-pppoe,
net-irc/xchat,
net-p2p/transmission-gtk,
x11-libs/gksu,
x11-terms/xterm,
sys-apps/gnome-disk-utility,
sys-apps/gpu-detector,
sys-auth/consolekit,
sys-block/parted,
sys-fs/ntfs3g,
sys-power/cpufrequtils,
www-client/midori,
x11-misc/bumblebee,
x11-misc/magneto-gtk,
x11-drivers/ati-drivers,
x11-drivers/nvidia-drivers,
x11-drivers/xf86-video-virtualbox,
x11-themes/gnome-themes-standard,
x11-themes/equinox-themes,
x11-themes/gtk-engines:2,
xfce-extra/xfce4-notifyd
# x11-themes/sabayon-artwork-gnome:
+5 -14
View File
@@ -38,7 +38,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh MATE
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
@@ -48,45 +48,36 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
packages_to_remove:
www-client/lynx
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
# List of packages that would be added from chrooted system (comma separated)
packages_to_add:
@X,
@fluxbox,
@wireless,
app-admin/rigo,
app-misc/sabayon-skel,
app-crypt/gnupg,
app-crypt/pinentry-gtk2,
app-emulation/virtualbox-guest-additions,
app-misc/anaconda-runtime-gui,
app-text/pastebunz,
gnome-extra/nm-applet-gtk2,
lxde-base/lxdm,
mate-base/mate,
media-fonts/ttf-bitstream-vera,
media-fonts/dejavu,
media-fonts/corefonts,
media-plugins/alsa-plugins,
media-sound/audacious,
net-dialup/rp-pppoe,
net-irc/xchat,
net-p2p/transmission-gtk,
x11-libs/gksu,
x11-terms/xterm,
sys-apps/gnome-disk-utility,
sys-apps/gpu-detector,
sys-auth/consolekit,
sys-block/parted,
sys-fs/ntfs3g,
sys-power/cpufrequtils,
www-client/midori,
x11-misc/bumblebee,
x11-misc/magneto-gtk,
x11-drivers/nvidia-drivers,
x11-drivers/xf86-video-virtualbox,
x11-themes/equinox-themes,
x11-themes/gnome-themes-standard,
x11-themes/gtk-engines:2
x11-themes/gnome-themes-standard
# x11-themes/sabayon-artwork-gnome:
# provides the gtk theme for lxdm
+4 -13
View File
@@ -38,7 +38,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh Xfce
# Post-ISO building script, called after ISO image generation.
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
@@ -49,10 +49,11 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorit
# www-client/lynx,
# app-text/poppler-qt4
# Import the Graphic Environment module.
%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
# List of packages that would be added from chrooted system (comma separated)
packages_to_add:
@X,
@fluxbox,
@gst-plugins,
@gst-plugins-extra,
@wireless,
@@ -76,8 +77,6 @@ packages_to_add:
app-dicts/myspell-nl,
app-emulation/virtualbox-guest-additions,
app-emulation/wine,
app-laptop/nvidiabl,
app-misc/anaconda-runtime-gui,
app-misc/gnote,
app-misc/sabayon-music,
app-office/libreoffice,
@@ -87,15 +86,11 @@ packages_to_add:
app-office/libreoffice-l10n-it,
app-office/libreoffice-l10n-nl,
app-office/libreoffice-l10n-pt,
app-text/epdfview,
app-text/pastebunz,
dev-java/icedtea-bin,
games-misc/cowsay,
gnome-extra/nm-applet-gtk2,
gnome-extra/polkit-gnome,
media-fonts/corefonts,
media-fonts/dejavu,
media-fonts/ttf-bitstream-vera,
media-gfx/gimp,
media-gfx/ristretto,
media-gfx/shotwell,
@@ -117,7 +112,6 @@ packages_to_add:
net-wireless/bluez,
net-wireless/bluez-firmware,
net-wireless/bluez-hcidump,
sys-apps/gpu-detector,
sys-auth/consolekit,
sys-block/gparted,
sys-block/parted,
@@ -131,14 +125,11 @@ packages_to_add:
x11-libs/gksu,
x11-libs/libva-vdpau-driver,
x11-libs/xvba-video,
x11-misc/bumblebee,
x11-misc/magneto-gtk,
x11-misc/xvkbd,
x11-terms/xfce4-terminal,
x11-terms/xterm,
x11-themes/equinox-themes,
x11-themes/gnome-themes-standard,
x11-themes/gtk-engines:2,
x11-themes/iottinka-artwork,
x11-themes/tango-icon-theme,
xfce-base/xfce4-panel,