tidy up build-conf

15 files changed, 69 insertions, 70 deletions

diff --git a/conf/intel/portage/package.env/00-redcore.package.env b/conf/intel/portage/package.env/00-generic.package.env
index 435684e..8365273 100644
--- a/conf/intel/portage/package.env/00-redcore.package.env
+++ b/conf/intel/portage/package.env/00-generic.package.env
@@ -1,6 +1,3 @@
-app-arch/engrampa disable.debug.conf
-dev-util/nvidia-cuda-sdk nographite.amd64.conf
-dev-util/nvidia-cuda-toolkit nographite.amd64.conf
 games-fps/xonotic O3.amd64.conf
 mail-client/thunderbird disable.debug.conf
 media-libs/x264 noframepointer.conf
diff --git a/conf/intel/portage/package.keywords/00-devel.package.keywords b/conf/intel/portage/package.keywords/00-devel.package.keywords
new file mode 100644
index 0000000..76acd8c
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-devel.package.keywords
@@ -0,0 +1,6 @@
+dev-db/sqlitebrowser ~amd64
+dev-db/sqlitestudio ~amd64
+dev-lang/fpc ~amd64
+dev-lang/lazarus ~amd64
+dev-qt/qt-creator ~amd64
+=sys-devel/gcc-5.4.0 ~amd64
diff --git a/conf/intel/portage/package.keywords/00-drmstack.package.keywords b/conf/intel/portage/package.keywords/00-drmstack.package.keywords
new file mode 100644
index 0000000..495932c
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-drmstack.package.keywords
@@ -0,0 +1,12 @@
+app-vim/llvm-vim ~amd64
+dev-libs/libclc ~amd64
+media-libs/mesa ~amd64
+media-video/libva-utils ~amd64
+sys-devel/clang ~amd64
+sys-devel/clang-runtime ~amd64
+sys-devel/llvm ~amd64
+sys-libs/compiler-rt ~amd64
+sys-libs/compiler-rt-sanitizers ~amd64
+x11-libs/libdrm ~amd64
+x11-libs/libva ~amd64
+x11-libs/libva-intel-driver ~amd64
diff --git a/conf/intel/portage/package.keywords/00-games.package.keywords b/conf/intel/portage/package.keywords/00-games.package.keywords
new file mode 100644
index 0000000..c81d09d
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games.package.keywords
@@ -0,0 +1,6 @@
+app-emulation/playonlinux ~amd64
+app-emulation/q4wine ~amd64
+app-emulation/steam ~amd64
+games-strategy/0ad ~amd64
+games-strategy/0ad-data ~amd64
+games-strategy/warzone2100 ~amd64
diff --git a/conf/intel/portage/package.keywords/00-gcc5.package.keywords b/conf/intel/portage/package.keywords/00-gcc5.package.keywords
deleted file mode 100644
index 5193f99..0000000
--- a/conf/intel/portage/package.keywords/00-gcc5.package.keywords
+++ /dev/null
@@ -1 +0,0 @@
-=sys-devel/gcc-5.4.0 ~amd64
diff --git a/conf/intel/portage/package.keywords/00-generic.package.keywords b/conf/intel/portage/package.keywords/00-generic.package.keywords
new file mode 100644
index 0000000..0109fe6
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-generic.package.keywords
@@ -0,0 +1,23 @@
+app-admin/keepassx ~amd64
+app-crypt/asedriveiiie-usb ~amd64
+app-office/wps-office ~amd64
+dev-libs/nss ~amd64
+dev-ruby/paint ~amd64
+dev-util/kbuild ~amd64
+games-misc/lolcat ~amd64
+media-gfx/librecad ~amd64
+media-gfx/rawtherapee ~amd64
+media-libs/libbluray ~amd64
+net-firewall/ufw-frontends ~amd64
+sys-apps/inxi ~amd64
+sys-firmware/b43-firmware ~amd64
+sys-firmware/b43legacy-firmware ~amd64
+sys-fs/cryptsetup ~amd64
+x11-apps/copyq ~amd64
+x11-apps/radeontop ~amd64
+x11-libs/qscintilla ~amd64
+x11-misc/primus ~amd64
+x11-misc/qarma ~amd64
+x11-misc/qlipper ~amd64
+x11-terms/qterminal ~amd64
+x11-themes/arc-theme ~amd64
diff --git a/conf/intel/portage/package.keywords/00-internet.package.keywords b/conf/intel/portage/package.keywords/00-internet.package.keywords
new file mode 100644
index 0000000..d7c6b29
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-internet.package.keywords
@@ -0,0 +1,11 @@
+mail-client/trojita ~amd64
+net-im/qtox ~amd64
+net-libs/tox ~amd64
+net-misc/cmst ~amd64
+net-misc/owncloud-client ~amd64
+net-misc/teamviewer ~amd64
+net-misc/youtube-dl ~amd64
+net-p2p/qbittorrent ~amd64
+www-client/google-chrome ~amd64
+www-client/opera ~amd64
+www-plugins/google-talkplugin ~amd64
diff --git a/conf/intel/portage/package.keywords/00-kdeapps.package.keywords b/conf/intel/portage/package.keywords/00-kdeapps.package.keywords
new file mode 100644
index 0000000..b2f403e
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-kdeapps.package.keywords
@@ -0,0 +1,5 @@
+kde-apps/ark ~amd64
+kde-apps/kcalc ~amd64
+kde-apps/k3b ~amd64
+kde-apps/kwave ~amd64
+kde-apps/libkcddb ~amd64
diff --git a/conf/intel/portage/package.keywords/00-mesastack.package.keywords b/conf/intel/portage/package.keywords/00-mesastack.package.keywords
deleted file mode 100644
index 0c575a9..0000000
--- a/conf/intel/portage/package.keywords/00-mesastack.package.keywords
+++ /dev/null
@@ -1,11 +0,0 @@
-=app-vim/llvm-vim-4.0.0 ~amd64
-=media-libs/mesa-17.0.3 ~amd64
-=media-video/libva-utils-1.8.0 ~amd64
-=sys-devel/clang-4.0.0-r1 ~amd64
-=sys-devel/clang-runtime-4.0.0 ~amd64
-=sys-devel/llvm-4.0.0-r1 ~amd64
-=sys-libs/compiler-rt-4.0.0 ~amd64
-=sys-libs/compiler-rt-sanitizers-4.0.0 ~amd64
-=x11-libs/libdrm-2.4.79 ~amd64
-=x11-libs/libva-1.8.0 ~amd64
-=x11-libs/libva-intel-driver-1.8.0 ~amd64
diff --git a/conf/intel/portage/package.keywords/00-multimedia.package.keywords b/conf/intel/portage/package.keywords/00-multimedia.package.keywords
new file mode 100644
index 0000000..bd5007b
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-multimedia.package.keywords
@@ -0,0 +1,6 @@
+media-tv/sopcast ~amd64
+media-tv/tv-maxe ~amd64
+media-tv/v4l-utils ~amd64
+media-video/guvcview ~amd64
+media-video/handbrake ~amd64
+media-video/obs-studio ~amd64
diff --git a/conf/intel/portage/package.keywords/00-redcore.package.keywords b/conf/intel/portage/package.keywords/00-redcore.package.keywords
deleted file mode 100644
index 155d4b6..0000000
--- a/conf/intel/portage/package.keywords/00-redcore.package.keywords
+++ /dev/null
@@ -1,55 +0,0 @@
-app-admin/keepassx ~amd64
-app-crypt/asedriveiiie-usb ~amd64
-app-emulation/playonlinux ~amd64
-app-emulation/q4wine ~amd64
-app-emulation/steam ~amd64
-app-office/wps-office ~amd64
-dev-db/sqlitebrowser ~amd64
-dev-db/sqlitestudio ~amd64
-dev-lang/fpc ~amd64
-dev-lang/lazarus ~amd64
-dev-libs/libclc ~amd64
-dev-libs/nss ~amd64
-dev-qt/qt-creator ~amd64
-dev-ruby/paint ~amd64
-dev-scheme/guile ~amd64
-dev-util/kbuild ~amd64
-games-misc/lolcat ~amd64
-games-strategy/0ad ~amd64
-games-strategy/0ad-data ~amd64
-games-strategy/warzone2100 ~amd64
-kde-apps/k3b ~amd64
-kde-apps/libkcddb ~amd64
-mail-client/trojita ~amd64
-media-gfx/librecad ~amd64
-media-gfx/rawtherapee ~amd64
-media-libs/libbluray ~amd64
-media-tv/sopcast ~amd64
-media-tv/tv-maxe ~amd64
-media-tv/v4l-utils ~amd64
-media-video/guvcview ~amd64
-media-video/handbrake ~amd64
-media-video/obs-studio ~amd64
-net-firewall/ufw-frontends ~amd64
-net-im/qtox ~amd64
-net-libs/tox ~amd64
-net-misc/cmst ~amd64
-net-misc/owncloud-client ~amd64
-net-misc/teamviewer ~amd64
-net-misc/youtube-dl ~amd64
-net-p2p/qbittorrent ~amd64
-sys-apps/inxi ~amd64
-sys-firmware/b43-firmware ~amd64
-sys-firmware/b43legacy-firmware ~amd64
-sys-fs/cryptsetup ~amd64
-www-client/google-chrome ~amd64
-www-client/opera ~amd64
-www-plugins/google-talkplugin ~amd64
-x11-apps/copyq ~amd64
-x11-apps/radeontop ~amd64
-x11-libs/qscintilla ~amd64
-x11-misc/primus ~amd64
-x11-misc/qarma ~amd64
-x11-misc/qlipper ~amd64
-x11-terms/qterminal ~amd64
-x11-themes/arc-theme ~amd64
diff --git a/conf/intel/portage/package.license/00-redcore.package.license b/conf/intel/portage/package.license/00-generic.package.license
index e52cf57..e52cf57 100644
--- a/conf/intel/portage/package.license/00-redcore.package.license
+++ b/conf/intel/portage/package.license/00-generic.package.license
diff --git a/conf/intel/portage/package.mask/00-redcore.package.mask b/conf/intel/portage/package.mask/00-generic.package.mask
index ff1df5c..ff1df5c 100644
--- a/conf/intel/portage/package.mask/00-redcore.package.mask
+++ b/conf/intel/portage/package.mask/00-generic.package.mask
diff --git a/conf/intel/portage/package.unmask/00-redcore.package.unmask b/conf/intel/portage/package.unmask/00-generic.package.unmask
index f8268e6..f8268e6 100644
--- a/conf/intel/portage/package.unmask/00-redcore.package.unmask
+++ b/conf/intel/portage/package.unmask/00-generic.package.unmask
diff --git a/conf/intel/portage/package.use/00-redcore.package.use b/conf/intel/portage/package.use/00-generic.package.use
index 455019a..455019a 100644
--- a/conf/intel/portage/package.use/00-redcore.package.use
+++ b/conf/intel/portage/package.use/00-generic.package.use