build calamares against python 3.4, change default backend to portage

6 files changed, 9 insertions, 13 deletions

diff --git a/app-admin/calamares/calamares-1.1.ebuild b/app-admin/calamares/calamares-1.1.ebuild
index 2c0af862..2d5b865d 100644
--- a/app-admin/calamares/calamares-1.1.ebuild
+++ b/app-admin/calamares/calamares-1.1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python3_3 )
+PYTHON_COMPAT=( python3_4 )
 
 inherit eutils cmake-utils python-r1
 
@@ -22,8 +22,7 @@ S="${WORKDIR}/${PN}-${PV}"
 DEPEND="
 	dev-vcs/git
 	python? (
-		>=dev-lang/python-3.3.5-r1:3.3
-		>=dev-libs/boost-1.55.0-r2[python_targets_python3_3]
+		>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
 	)
 	>=dev-qt/designer-5.4.0:5
 	>=dev-qt/linguist-tools-5.4.0:5
diff --git a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
index e46b065f..11600728 100644
--- a/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
+++ b/app-misc/calamares-config-kogaion/calamares-config-kogaion-2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-admin/calamares"
diff --git a/app-misc/calamares-config-kogaion/files/modules/packages.conf b/app-misc/calamares-config-kogaion/files/modules/packages.conf
index 4f9f6a49..ad0ea365 100644
--- a/app-misc/calamares-config-kogaion/files/modules/packages.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/packages.conf
@@ -11,7 +11,7 @@
 #  - portage	 - Gentoo package manager
 #  - entropy	 - Sabayon package manager
 #
-backend: entropy
+backend: portage
 #
 # List of maps with package operations such as install or remove.
 # Distro developers can provide a list of packages to remove
diff --git a/app-misc/calamares-config-kogaion/files/modules/users.conf b/app-misc/calamares-config-kogaion/files/modules/users.conf
index 60631623..cec4257a 100644
--- a/app-misc/calamares-config-kogaion/files/modules/users.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/users.conf
@@ -11,10 +11,6 @@ defaultGroups:
     - cdrw
     - usb
     - plugdev
-    - vboxusers
-    - vboxguest
-    - vboxsf
-    - entropy
     - portage
     - messagebus
 autologinGroup:  autologin
diff --git a/app-misc/calamares-config-kogaion/files/modules/welcome.conf b/app-misc/calamares-config-kogaion/files/modules/welcome.conf
index 7e4f3404..29bcd5fb 100644
--- a/app-misc/calamares-config-kogaion/files/modules/welcome.conf
+++ b/app-misc/calamares-config-kogaion/files/modules/welcome.conf
@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
 requirements:
-    requiredStorage:    10.0
+    requiredStorage:    15.0
     requiredRam:        1.0
     check:
         - storage
diff --git a/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
index 56ce336e..5d27440d 100644
--- a/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
+++ b/app-misc/calamares-runtime/calamares-runtime-2.0-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+PYTHON_COMPAT=( python3_4 )
+
 DESCRIPTION="Calamares distribution-independent installer framework runtime meta-package (containing all the runtime dependencies)"
 SRC_URI=""
 
@@ -15,13 +17,12 @@ IUSE="+branding +python"
 DEPEND=""
 RDEPEND="
 	python? (
-		>=dev-lang/python-3.3.5-r1:3.3
-		>=dev-libs/boost-1.55.0-r2[python_targets_python3_3]
+		>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
 	)
 	branding? ( >=x11-themes/kogaion-artwork-calamares-2.0 )
 	>=app-misc/calamares-config-kogaion-2.0
 	>=dev-qt/designer-5.4.0:5
-	>=dev-qt/linguist-tools-5.4.0:5	
+	>=dev-qt/linguist-tools-5.4.0:5
 	>=dev-qt/qtconcurrent-5.4.0:5
 	>=dev-qt/qtcore-5.4.0:5
 	>=dev-qt/qtdbus-5.4.0:5