merge all keyword files...eit seems to be stupid with many of them

6 files changed, 82 insertions, 75 deletions

diff --git a/conf/intel/portage/package.keywords/00-kogaion.package.keywords b/conf/intel/portage/package.keywords/00-kogaion.package.keywords
index a728549..2973618 100644
--- a/conf/intel/portage/package.keywords/00-kogaion.package.keywords
+++ b/conf/intel/portage/package.keywords/00-kogaion.package.keywords
@@ -65,3 +65,85 @@
 =app-admin/system-config-users-1.2.96-r2 ~amd64 ~x86
 =app-admin/firstboot-1.110-r1 ~amd64 ~x86
 
+# anaconda
+=app-admin/anaconda-9999 **
+=app-misc/anaconda-runtime-1.1-r3 ~amd64 ~x86
+
+# required for calamares to build && run
+app-admin/calamares::kogaion-desktop ~amd64  ~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
+
+#lightdm
+=x11-misc/lightdm-qt4-1.12.2 ~amd64 ~x86
+=x11-misc/lightdm-1.12.2 ~amd64 ~x86
+=x11-misc/lightdm-base-1.12.2 ~amd64 ~x86
+=app-eselect/eselect-lightdm-0.2 ~amd64 ~x86
+=x11-misc/lightdm-gtk-greeter-2.0.0 ~amd64 ~x86
+
+#xfce4.12
+=dev-util/xfce4-dev-tools-4.12.0 ~amd64 ~x86
+=xfce-base/xfdesktop-4.12.2 ~amd64 ~x86
+=xfce-base/xfce4-settings-4.12.0 ~amd64 ~x86
+=xfce-base/xfwm4-4.12.3 ~amd64 ~x86
+=xfce-base/xfce4-meta-4.12 ~amd64 ~x86
+=xfce-base/xfce4-appfinder-4.12.0-r1 ~amd64 ~x86
+=xfce-base/garcon-0.5.0-r1 ~amd64 ~x86
+=xfce-base/libxfce4ui-4.12.1-r1 ~amd64 ~x86
+=xfce-base/libxfce4util-4.12.1 ~amd64 ~x86
+=xfce-base/xfce4-panel-4.12.0 ~amd64 ~x86
+=xfce-base/xfce4-session-4.12.1 ~amd64 ~x86
+=xfce-base/xfconf-4.12.0 ~amd64 ~x86
+=xfce-base/exo-0.10.6 ~amd64 ~x86
+=xfce-base/thunar-1.6.10 ~amd64 ~x86
+=xfce-extra/xfce4-power-manager-1.5.0 ~amd64 ~x86
+=xfce-extra/xfce4-gvfs-mount-0.0.4 ~amd64 ~x86
+=xfce-extra/xfce-theme-manager-0.3.5 ~amd64 ~x86
+=x11-themes/elementary-xfce-icon-theme-0.4_p20150327 ~amd64 ~x86
+=xfce-extra/xfce4-composite-editor-0 ~amd64 ~x86
+=xfce-extra/xfce4-pulseaudio-plugin-0.2.2 ~amd64 ~x86
+=xfce-extra/xfce4-indicator-plugin-2.3.3 ~amd64 ~x86
+=x11-misc/alacarte-xfce-3.7.90 ~amd64 ~x86
+
+# misc
+=app-arch/xarchiver-0.5.4 ~amd64 ~x86
+=app-cdr/isomd5sum-1.0.12 ~amd64 ~x86
+=app-misc/passwordless-upgrade-1 ~amd64 ~x86
+=app-text/pastebunz-1.4-r1 ~amd64 ~x86
+=dev-libs/libindicator-12.10.1-r300 ~amd64 ~x86
+=dev-libs/satyr-0.13 ~amd64 ~x86
+=dev-util/pykickstart-1.99.54 ~amd64 ~x86
+=gnome-extra/nm-applet-gtk2-0.9.8.10 ~amd64 ~x86
+=media-libs/giflib-4.2.3-r1 ~amd64 ~x86
+=net-firewall/ufw-0.34_pre805-r2 ~amd64 ~x86
+=net-firewall/ufw-frontends-0.3.2-r3 ~amd64 ~x86
+=net-misc/fcoe-utils-1.0.25 ~amd64 ~x86
+=net-misc/lldpad-0.9.45 ~amd64 ~x86
+=net-wireless/blueman-1.98_p20150105 ~amd64 ~x86
+=sys-apps/hbaapi-2.2 ~amd64 ~x86
+=sys-apps/libhbalinux-1.0.14 ~amd64 ~x86
+=sys-boot/makebootfat-1.4 ~amd64 ~x86
+<=sys-fs/dmraid-1.0.0_rc15
+=sys-libs/libuser-0.60-r1 ~amd64 ~x86
+=virtual/acl-0-r2 ~amd64 ~x86
+
diff --git a/conf/intel/portage/package.keywords/01-anaconda.package.keywords b/conf/intel/portage/package.keywords/01-anaconda.package.keywords
deleted file mode 100644
index a612dca..0000000
--- a/conf/intel/portage/package.keywords/01-anaconda.package.keywords
+++ /dev/null
@@ -1,2 +0,0 @@
-=app-admin/anaconda-9999 **
-=app-misc/anaconda-runtime-1.1-r3 ~amd64 ~x86
diff --git a/conf/intel/portage/package.keywords/01-calamares.package.keywords b/conf/intel/portage/package.keywords/01-calamares.package.keywords
deleted file mode 100644
index 0b978f5..0000000
--- a/conf/intel/portage/package.keywords/01-calamares.package.keywords
+++ /dev/null
@@ -1,24 +0,0 @@
-# required for calamares to build && run
-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.keywords/01-kogaion.package.keywords b/conf/intel/portage/package.keywords/01-kogaion.package.keywords
deleted file mode 100644
index 59b6499..0000000
--- a/conf/intel/portage/package.keywords/01-kogaion.package.keywords
+++ /dev/null
@@ -1,21 +0,0 @@
-=app-arch/xarchiver-0.5.4 ~amd64 ~x86
-=app-cdr/isomd5sum-1.0.12 ~amd64 ~x86
-=app-misc/passwordless-upgrade-1 ~amd64 ~x86
-=app-text/pastebunz-1.4-r1 ~amd64 ~x86
-=dev-libs/libindicator-12.10.1-r300 ~amd64 ~x86
-=dev-libs/satyr-0.13 ~amd64 ~x86
-=dev-util/pykickstart-1.99.54 ~amd64 ~x86
-=gnome-extra/nm-applet-gtk2-0.9.8.10 ~amd64 ~x86
-=media-libs/giflib-4.2.3-r1 ~amd64 ~x86
-=net-firewall/ufw-0.34_pre805-r2 ~amd64 ~x86
-=net-firewall/ufw-frontends-0.3.2-r3 ~amd64 ~x86
-=net-misc/fcoe-utils-1.0.25 ~amd64 ~x86
-=net-misc/lldpad-0.9.45 ~amd64 ~x86
-=net-wireless/blueman-1.98_p20150105 ~amd64 ~x86
-=sys-apps/hbaapi-2.2 ~amd64 ~x86
-=sys-apps/libhbalinux-1.0.14 ~amd64 ~x86
-=sys-boot/makebootfat-1.4 ~amd64 ~x86
-<=sys-fs/dmraid-1.0.0_rc15
-=sys-libs/libuser-0.60-r1 ~amd64 ~x86
-=virtual/acl-0-r2 ~amd64 ~x86
-
diff --git a/conf/intel/portage/package.keywords/01-lightdm.package.keywords b/conf/intel/portage/package.keywords/01-lightdm.package.keywords
deleted file mode 100644
index 44ae321..0000000
--- a/conf/intel/portage/package.keywords/01-lightdm.package.keywords
+++ /dev/null
@@ -1,6 +0,0 @@
-=x11-misc/lightdm-qt4-1.12.2 ~amd64 ~x86
-=x11-misc/lightdm-1.12.2 ~amd64 ~x86
-=x11-misc/lightdm-base-1.12.2 ~amd64 ~x86
-=app-eselect/eselect-lightdm-0.2 ~amd64 ~x86
-=x11-misc/lightdm-gtk-greeter-2.0.0 ~amd64 ~x86
-
diff --git a/conf/intel/portage/package.keywords/01-xfce.package.keywords b/conf/intel/portage/package.keywords/01-xfce.package.keywords
deleted file mode 100644
index 8ab54c5..0000000
--- a/conf/intel/portage/package.keywords/01-xfce.package.keywords
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-util/xfce4-dev-tools-4.12.0 ~amd64 ~x86
-=xfce-base/xfdesktop-4.12.2 ~amd64 ~x86
-=xfce-base/xfce4-settings-4.12.0 ~amd64 ~x86
-=xfce-base/xfwm4-4.12.3 ~amd64 ~x86
-=xfce-base/xfce4-meta-4.12 ~amd64 ~x86
-=xfce-base/xfce4-appfinder-4.12.0-r1 ~amd64 ~x86
-=xfce-base/garcon-0.5.0-r1 ~amd64 ~x86
-=xfce-base/libxfce4ui-4.12.1-r1 ~amd64 ~x86
-=xfce-base/libxfce4util-4.12.1 ~amd64 ~x86
-=xfce-base/xfce4-panel-4.12.0 ~amd64 ~x86
-=xfce-base/xfce4-session-4.12.1 ~amd64 ~x86
-=xfce-base/xfconf-4.12.0 ~amd64 ~x86
-=xfce-base/exo-0.10.6 ~amd64 ~x86
-=xfce-base/thunar-1.6.10 ~amd64 ~x86
-=xfce-extra/xfce4-power-manager-1.5.0 ~amd64 ~x86
-=xfce-extra/xfce4-gvfs-mount-0.0.4 ~amd64 ~x86
-=xfce-extra/xfce-theme-manager-0.3.5 ~amd64 ~x86
-=x11-themes/elementary-xfce-icon-theme-0.4_p20150327 ~amd64 ~x86
-=xfce-extra/xfce4-composite-editor-0 ~amd64 ~x86
-=xfce-extra/xfce4-pulseaudio-plugin-0.2.2 ~amd64 ~x86
-=xfce-extra/xfce4-indicator-plugin-2.3.3 ~amd64 ~x86
-=x11-misc/alacarte-xfce-3.7.90 ~amd64 ~x86