Revert "Drop calamares, put anaconda back."

This reverts commit 94fe66dcde.

molecules/enlightenment.common

@@ -50,6 +50,7 @@ packages_to_add:
 	app-crypt/pinentry-gtk2,
 	app-editors/leafpad,
 	app-text/pastebunz,
+	app-misc/calamares-sabayon,
 	dev-libs/fribidi,
 	games-misc/cowsay,
 	gnome-extra/nm-applet-gtk2,

molecules/forensicxfce.common

@@ -85,6 +85,7 @@ packages_to_add:
 	app-crypt/gifshuffle,
 	app-crypt/pdfcrack,
 	app-crypt/WiRouterKeyRec,
+	app-misc/calamares-sabayon,
 	app-misc/screen,
 	app-office/libreoffice,
 	dev-util/geany,

molecules/gnome.common

@@ -72,6 +72,7 @@ packages_to_add:
 	app-dicts/myspell-nl,
 	app-editors/atom,
 	app-editors/gedit,
+        app-misc/calamares-sabayon,
 	app-misc/gnote,
 	app-misc/sabayon-greeter,
 	app-misc/sabayon-version,

molecules/kde.common

@@ -66,6 +66,7 @@ packages_to_add:
 	app-dicts/myspell-nl,
 	app-editors/atom,
 	app-misc/sabayon-greeter,
+	app-misc/calamares-sabayon,
 	app-misc/sabayon-skel,
 	app-misc/sabayon-version,
 	app-office/libreoffice,

molecules/mate.common

@@ -51,6 +51,8 @@ packages_to_add:
 	app-crypt/gnupg,
 	app-misc/sabayon-greeter,
 	app-editors/atom,
+	app-crypt/pinentry-gtk2,
+        app-misc/calamares-sabayon,
 	app-text/pastebunz,
 	app-office/libreoffice,
 	games-action/minetest,

molecules/minimal.common

@@ -44,6 +44,7 @@ extra_mksquashfs_parameters: -comp xz
 packages_to_add:
 	@wireless,
 	@fluxbox,
+        app-misc/calamares-sabayon,
 	app-text/pastebunz,
 	lxde-base/lxdm,
 	media-gfx/feh,

molecules/server.common

@@ -42,7 +42,7 @@ packages_to_add:
 	@wireless,
 	app-misc/calamares-sabayon-server,
 	app-text/pastebunz,
-	x11-base/xorg-server,
+	 x11-base/xorg-server,
 	net-dialup/ppp,
 	net-dialup/rp-pppoe,
 	net-misc/openssh,

molecules/xfce.common

@@ -66,6 +66,7 @@ packages_to_add:
 	app-dicts/myspell-fr,
 	app-dicts/myspell-it,
 	app-dicts/myspell-nl,
+        app-misc/calamares-sabayon,
 	app-misc/gnote,
 	app-misc/sabayon-greeter,
 	app-office/libreoffice,