clean up the mess from the buildserver, arrange keywords, fix useflags needed for calamares, fix make.conf for calamares

5 files changed, 98 insertions, 41 deletions

diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
index 1e61ae6..5d2a357 100644
--- a/conf/intel/portage/make.conf.amd64
+++ b/conf/intel/portage/make.conf.amd64
@@ -8,14 +8,14 @@ CFLAGS="-O2 -march=x86-64 -pipe" # -ftree-vectorize ${GRAPHITE}"
 CHOST="x86_64-pc-linux-gnu"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j16 -s"
+MAKEOPTS="-j9 -s"
 
 # Portage stuff
 FEATURES="parallel-fetch protect-owned compressdebug splitdebug"
 CCACHE_SIZE="2G"
 CCACHE_DIR="/var/ccache"
 
-LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh"
+LINGUAS="en en_US ro"
 
 ## USE ##
 SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd -libav"
@@ -32,8 +32,8 @@ SAB_COMMS="jabber msn yahoo icq irc aim rss slp mail imap"
 USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PRINT} ${SAB_XSYS} ${SAB_DESKTOP} ${SAB_BROWSER} ${SAB_COMMS}"	
 
 ## DEVICES ##
-INPUT_DEVICES="evdev void"
-VIDEO_CARDS="fbdev intel i915 i965 nouveau r100 r200 r300 r600 vesa vmware radeonsi radeon"
+INPUT_DEVICES="evdev void synaptics"
+VIDEO_CARDS="fbdev intel i915 i965 nouveau r100 r200 r300 r600 vesa vmware radeonsi radeon virtualbox"
 LIRC_DEVICES="audio audio_alsa serial pctv"
 ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y"
 CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template"
@@ -57,7 +57,7 @@ PYTHON_TARGETS="python2_7 python3_3"
 
 # Some more forced targets
 PHP_TARGETS="php5-4"
-RUBY_TARGETS="ruby19"
+RUBY_TARGETS="ruby19 ruby20"
 
 # Apache suEXEC default UMASK
 # See bug 3544
diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
index 85390bd..689b0e1 100644
--- a/conf/intel/portage/make.conf.x86
+++ b/conf/intel/portage/make.conf.x86
@@ -8,14 +8,14 @@ CFLAGS="-O2 -march=i686 -pipe" # -ftree-vectorize ${GRAPHITE}"
 CHOST="i686-pc-linux-gnu"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j16 -s"
+MAKEOPTS="-j9 -s"
 
 # Portage stuff
 FEATURES="parallel-fetch protect-owned compressdebug splitdebug"
 CCACHE_SIZE="2G"
 CCACHE_DIR="/var/ccache"
 
-LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh"
+LINGUAS="en en_US ro"
 
 ## USE ##
 SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd -libav"
@@ -34,8 +34,8 @@ SAB_COMMS="jabber msn yahoo icq irc aim rss slp mail imap"
 USE="${SAB_BAD} ${SAB_MEDIA} ${SAB_CODECS} ${SAB_SYSTEM} ${SAB_FILESYS} ${SAB_PRINT} ${SAB_XSYS} ${SAB_DESKTOP} ${SAB_BROWSER} ${SAB_COMMS}"
 
 ## DEVICES ##
-INPUT_DEVICES="evdev void"
-VIDEO_CARDS="fbdev intel i915 i965 nouveau r100 r200 r300 r600 vesa vmware radeonsi radeon"
+INPUT_DEVICES="evdev void synaptics"
+VIDEO_CARDS="fbdev intel i915 i965 nouveau r100 r200 r300 r600 vesa vmware radeonsi radeon virtualbox"
 LIRC_DEVICES="audio audio_alsa serial pctv"
 ALSA_CARDS="emu10k1x darla20 darla24 emu10k1 gina20 gina24 hdsp hdspm ice1712 indigo indigoio layla20 layla24 mia mixart mona pcxhr rme32 rme96 sb16 sbawe sscape usbusx2y vx222 usb-usx2y"
 CAMERAS="agfa_cl20 casio_qv dimagev dimera3500 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica_qm150 panasonic_coolshot panasonic_dc1000 panasonic_dc1580 panasonic_l859 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ricoh_g3 sipix_blink sipix_blink2 sipix_web2 sony_dscf1 sony_dscf55 toshiba_pdrm11 adc65 aox barbie canon clicksmart310 digigr8 digita directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 konica largan lg_gsm mars mustek pccam300 pccam600 ptp2 ricoh samsung sierra smal sonix soundvision spca50x sq905 stv0674 stv0680 sx330z template"
@@ -60,7 +60,7 @@ PYTHON_TARGETS="python2_7 python3_3"
 
 # Other forced targets
 PHP_TARGETS="php5-4"
-RUBY_TARGETS="ruby19"
+RUBY_TARGETS="ruby19 ruby20"
 
 # Apache suEXEC default UMASK
 # See bug 3544
diff --git a/conf/intel/portage/package.keywords/00-kogaion.package.keywords b/conf/intel/portage/package.keywords/00-kogaion.package.keywords
index f7c79c4..a728549 100644
--- a/conf/intel/portage/package.keywords/00-kogaion.package.keywords
+++ b/conf/intel/portage/package.keywords/00-kogaion.package.keywords
@@ -1,11 +1,67 @@
-# install equo from OUR overlay
-=app-admin/equo-292::kogaion ~amd64 ~x86 
-=sys-apps/entropy-292::kogaion ~amd64 ~x86
-=sys-apps/entropy-server-292::kogaion ~amd64 ~x86
-=app-admin/matter-292::kogaion ~amd64 ~x86
+# package manager
+=app-admin/equo-296::kogaion ~amd64 ~x86
+=sys-apps/entropy-296::kogaion ~amd64 ~x86
+=sys-apps/entropy-server-296::kogaion ~amd64 ~x86
+=app-admin/matter-296::kogaion ~amd64 ~x86
+=app-admin/rigo-296 ~amd64 ~x86
+=sys-apps/rigo-daemon-296 ~amd64 ~x86
+=app-admin/packagekit-base-0.8.15-r1 ~amd64 ~x86
 
-# install grub2 with zfs support from OUR overlay
-=sys-boot/grub-2.00-r7::kogaion-desktop ~amd64 ~x86
+#artwork && skel
+>=x11-themes/kogaion-artwork-core-2.1 ~amd64 ~x86
 =x11-themes/kogaion-artwork-grub-2.1 ~amd64 ~x86
+>=x11-themes/kogaion-artwork-isolinux-2.1 ~amd64 ~x86
+=x11-themes/kogaion-artwork-lxde-1.1-r2 ~amd64 ~x86
+=x11-themes/kogaion-dark-theme-2.1 ~amd64 ~x86
+=x11-themes/kogaion-elementary-icons-1.0 ~amd64 ~x86
+=x11-themes/zukitwo-brave-0.1 ~amd64 ~x86
+=x11-themes/numix-icon-theme-9999 **
+=x11-themes/gtk-engines-equinox-1.50 ~amd64 ~x86
+=x11-themes/numix-icon-theme-circle-9999 **
+=x11-themes/faenza-kupertino-icons-1.0 ~amd64 ~x86
+=x11-themes/iottinka-artwork-1.0-r1 ~amd64 ~x86
+=app-misc/kogaion-skel-1 ~amd64 ~x86
+
+# kernel && drivers
+=sys-kernel/kogaion-sources-3.14.30 ~amd64 ~x86
+=sys-kernel/linux-kogaion-3.14.30 ~amd64 ~x86
+>=sys-kernel/genkernel-next-63 ~amd64 ~x86
+=sys-kernel/spl-0.6.3-r1 ~amd64 ~x86
+>=x11-drivers/nvidia-drivers-340.00::kogaion-desktop ~amd64 ~x86
+>=x11-drivers/nvidia-userspace-340.00::kogaion-desktop ~amd64 ~x86
 =sys-fs/zfs-0.6.3-r2 ~amd64 ~x86
+>=sys-fs/zfs-kmod-0.6.3 ~amd64 ~x86
+
+# bootloader
+=sys-boot/grub-2.00-r7::kogaion-desktop ~amd64 ~x86
+
+#molecules
+=dev-util/molecule-2 ~amd64 ~x86
+=dev-util/molecule-core-1.0.2 ~amd64 ~x86
+=dev-util/molecule-plugins-1.0.2 ~amd64 ~x86
+
+#magneto
+>=sys-apps/magneto-core-295 ~amd64 ~x86
+=x11-misc/magneto-gtk-296 ~amd64 ~x86
+=app-misc/magneto-loader-296 ~amd64 ~x86
+
+#python
+=dev-python/python-report-0.23 ~amd64 ~x86
+=dev-python/python-nss-0.16.0 ~amd64 ~x86
+=dev-python/python-cryptsetup-0.1.4-r1 ~amd64 ~x86
+=dev-python/python-meh-0.30-r1 ~amd64 ~x86
+=dev-python/pyblock-0.46 ~amd64 ~x86
+=dev-python/python-ethtool-0.3 ~amd64 ~x86
+=dev-python/rhpl-0.219 ~amd64 ~x86
+
+#crypt
+=app-crypt/shim-signed-0.2 ~amd64 ~x86
+=app-crypt/pinentry-base-0.9.0 ~amd64 ~x86
+=app-crypt/pinentry-gtk2-0.9.0 ~amd64 ~x86
+
+#system-config
+=app-admin/system-config-keyboard-1.3.1-r2 ~amd64 ~x86
+=app-admin/system-config-date-1.9.57-r1 ~amd64 ~x86
+=app-admin/system-config-users-1.2.96-r2 ~amd64 ~x86
+=app-admin/firstboot-1.110-r1 ~amd64 ~x86
 
diff --git a/conf/intel/portage/package.keywords/01-calamares.package.keywords b/conf/intel/portage/package.keywords/01-calamares.package.keywords
index bfc1226..0b978f5 100644
--- a/conf/intel/portage/package.keywords/01-calamares.package.keywords
+++ b/conf/intel/portage/package.keywords/01-calamares.package.keywords
@@ -1,24 +1,24 @@
 # required for calamares to build && run
-app-admin/calamares::kogaion-desktop ~amd64 ~x86
-dev-qt/qtcore:5 ~amd64 ~x86
-dev-qt/qtdbus:5 ~amd64 ~x86
-dev-qt/qtgui:5 ~amd64 ~x86
-dev-qt/qtsvg:5 ~amd64 ~x86
-dev-qt/qtwidgets:5 ~amd64 ~x86
-dev-qt/qtopengl:5 ~amd64 ~x86
-dev-qt/designer:5 ~amd64 ~x86
-dev-qt/qttest:5 ~amd64 ~x86
-dev-qt/qtxml:5 ~amd64 ~x86
-dev-qt/qtdeclarative:5 ~amd64 ~x86
-dev-qt/qtxmlpatterns:5 ~amd64 ~x86
-dev-qt/qtnetwork:5 ~amd64 ~x86
-dev-qt/qtscript:5 ~amd64 ~x86
-dev-qt/qtconcurrent:5 ~amd64 ~x86
-dev-qt/qtprintsupport:5 ~amd64 ~x86
-dev-qt/linguist-tools:5 ~amd64 ~x86
-kde-frameworks/kconfig:5 ~amd64 ~x86
-kde-frameworks/ki18n:5 ~amd64 ~x86
-kde-frameworks/kcoreaddons:5 ~amd64 ~x86
-kde-frameworks/solid:5 ~amd64 ~x86
-kde-frameworks/extra-cmake-modules:5 ~amd64 ~x86
-kde-frameworks/kf-env:5 ~amd64 ~x86
+app-admin/calamares::kogaion-desktop ~amd64 ~x86 ~x86
+dev-qt/qtcore:5 ~amd64 ~x86 ~x86
+dev-qt/qtdbus:5 ~amd64 ~x86 ~x86
+dev-qt/qtgui:5 ~amd64 ~x86 ~x86
+dev-qt/qtsvg:5 ~amd64 ~x86 ~x86
+dev-qt/qtwidgets:5 ~amd64 ~x86 ~x86
+dev-qt/qtopengl:5 ~amd64 ~x86 ~x86
+dev-qt/designer:5 ~amd64 ~x86 ~x86
+dev-qt/qttest:5 ~amd64 ~x86 ~x86
+dev-qt/qtxml:5 ~amd64 ~x86 ~x86
+dev-qt/qtdeclarative:5 ~amd64 ~x86 ~x86
+dev-qt/qtxmlpatterns:5 ~amd64 ~x86 ~x86
+dev-qt/qtnetwork:5 ~amd64 ~x86 ~x86
+dev-qt/qtscript:5 ~amd64 ~x86 ~x86
+dev-qt/qtconcurrent:5 ~amd64 ~x86 ~x86
+dev-qt/qtprintsupport:5 ~amd64 ~x86 ~x86
+dev-qt/linguist-tools:5 ~amd64 ~x86 ~x86
+kde-frameworks/kconfig:5 ~amd64 ~x86 ~x86
+kde-frameworks/ki18n:5 ~amd64 ~x86 ~x86
+kde-frameworks/kcoreaddons:5 ~amd64 ~x86 ~x86
+kde-frameworks/solid:5 ~amd64 ~x86 ~x86
+kde-frameworks/extra-cmake-modules:5 ~amd64 ~x86 ~x86
+kde-frameworks/kf-env:5 ~amd64 ~x86 ~x86
diff --git a/conf/intel/portage/package.use/01-calamares.package.use b/conf/intel/portage/package.use/01-calamares.package.use
index abba543..a5e7218 100644
--- a/conf/intel/portage/package.use/01-calamares.package.use
+++ b/conf/intel/portage/package.use/01-calamares.package.use
@@ -1,5 +1,6 @@
 # required for calamares to build && run
-dev-qt/qtgui:5 -gtkstyle
+dev-qt/qtgui:5 gtkstyle
+dev-qt/qtwidgets:5 gtkstyle
 dev-libs/libpcre pcre16
 x11-libs/libxcb xkb
 sys-auth/polkit-qt qt5