split global make.conf into many small pieces

18 files changed, 84 insertions, 208 deletions

diff --git a/conf/intel/portage/.gitignore b/conf/intel/portage/.gitignore
deleted file mode 100644
index cb1319b..0000000
--- a/conf/intel/portage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-binhost.conf
diff --git a/conf/intel/portage/global.conf/abi.conf b/conf/intel/portage/global.conf/abi.conf
new file mode 100644
index 0000000..2973060
--- /dev/null
+++ b/conf/intel/portage/global.conf/abi.conf
@@ -0,0 +1 @@
+ABI_X86="64 32"
diff --git a/conf/intel/portage/binhost.conf b/conf/intel/portage/global.conf/binhost.conf
index d1bb608..e4ed412 100644
--- a/conf/intel/portage/binhost.conf
+++ b/conf/intel/portage/global.conf/binhost.conf
@@ -2,4 +2,4 @@
 # PORTAGE_BINHOST="http://redcorelinux.org/binhost/amd64/"
 
 # Princeton University (USA) mirror
-PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/binhost/amd64/"
+PORTAGE_BINHOST="http://mirror.math.princeton.edu/pub/redcorelinux/packages/"
diff --git a/conf/intel/portage/global.conf/cflags.conf b/conf/intel/portage/global.conf/cflags.conf
new file mode 100644
index 0000000..4e84815
--- /dev/null
+++ b/conf/intel/portage/global.conf/cflags.conf
@@ -0,0 +1,5 @@
+CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe"
+CHOST="x86_64-pc-linux-gnu"
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="-Wl,-O1 -Wl,--as-needed"
+MAKEOPTS="-j8 -s"
diff --git a/conf/intel/portage/global.conf/cpuflags.conf b/conf/intel/portage/global.conf/cpuflags.conf
new file mode 100644
index 0000000..c9588f3
--- /dev/null
+++ b/conf/intel/portage/global.conf/cpuflags.conf
@@ -0,0 +1 @@
+CPU_FLAGS_X86="mmx mmxext sse sse2 sse3"
diff --git a/conf/intel/portage/global.conf/devices.conf b/conf/intel/portage/global.conf/devices.conf
new file mode 100644
index 0000000..b5db229
--- /dev/null
+++ b/conf/intel/portage/global.conf/devices.conf
@@ -0,0 +1,3 @@
+INPUT_DEVICES="evdev synaptics"
+VIDEO_CARDS="intel i915 i965 nouveau nvidia r100 r200 r300 r600 vesa amdgpu radeonsi radeon vmware"
+LIRC_DEVICES="audio audio_alsa serial pctv"
diff --git a/conf/intel/portage/global.conf/distfiles.conf b/conf/intel/portage/global.conf/distfiles.conf
new file mode 100644
index 0000000..755228b
--- /dev/null
+++ b/conf/intel/portage/global.conf/distfiles.conf
@@ -0,0 +1 @@
+GENTOO_MIRRORS="http://mirror.bytemark.co.uk/gentoo/"
diff --git a/conf/intel/portage/global.conf/grub.conf b/conf/intel/portage/global.conf/grub.conf
new file mode 100644
index 0000000..2ce1670
--- /dev/null
+++ b/conf/intel/portage/global.conf/grub.conf
@@ -0,0 +1 @@
+GRUB_PLATFORMS="efi-32 efi-64 pc"
diff --git a/conf/intel/portage/global.conf/languages.conf b/conf/intel/portage/global.conf/languages.conf
new file mode 100644
index 0000000..b0e7644
--- /dev/null
+++ b/conf/intel/portage/global.conf/languages.conf
@@ -0,0 +1,2 @@
+L10N="en en-US en-GB uk ro-RO ro"
+LINGUAS="en en_US en_GB uk ro_RO ro"
diff --git a/conf/intel/portage/global.conf/layout.conf b/conf/intel/portage/global.conf/layout.conf
new file mode 100644
index 0000000..a33c3ae
--- /dev/null
+++ b/conf/intel/portage/global.conf/layout.conf
@@ -0,0 +1,8 @@
+PORTDIR="/usr/portage"
+DISTDIR="${PORTDIR}/distfiles"
+
+INSTALL_MASK="/etc/systemd
+              /usr/lib/systemd
+              /usr/lib64/systemd
+              /usr/lib/debug
+              /usr/lib64/debug"
diff --git a/conf/intel/portage/global.conf/libreoffice.conf b/conf/intel/portage/global.conf/libreoffice.conf
new file mode 100644
index 0000000..e3e8c26
--- /dev/null
+++ b/conf/intel/portage/global.conf/libreoffice.conf
@@ -0,0 +1 @@
+LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport"
diff --git a/conf/intel/portage/global.conf/python.conf b/conf/intel/portage/global.conf/python.conf
new file mode 100644
index 0000000..5994b23
--- /dev/null
+++ b/conf/intel/portage/global.conf/python.conf
@@ -0,0 +1,2 @@
+USE_PYTHON="2.7 3.4"
+PYTHON_TARGETS="python2_7 python3_4"
diff --git a/conf/intel/portage/global.conf/qemu.conf b/conf/intel/portage/global.conf/qemu.conf
new file mode 100644
index 0000000..a38f2a3
--- /dev/null
+++ b/conf/intel/portage/global.conf/qemu.conf
@@ -0,0 +1,2 @@
+QEMU_USER_TARGETS="x86_64 i386"
+QEMU_SOFTMMU_TARGETS="x86_64 i386"
diff --git a/conf/intel/portage/global.conf/ruby.conf b/conf/intel/portage/global.conf/ruby.conf
new file mode 100644
index 0000000..37fcc05
--- /dev/null
+++ b/conf/intel/portage/global.conf/ruby.conf
@@ -0,0 +1 @@
+RUBY_TARGETS="ruby22"
diff --git a/conf/intel/portage/global.conf/useflags.conf b/conf/intel/portage/global.conf/useflags.conf
new file mode 100644
index 0000000..7620e01
--- /dev/null
+++ b/conf/intel/portage/global.conf/useflags.conf
@@ -0,0 +1,10 @@
+SYSTEM_USE="X wayland glamor openrc sysvinit consolekit cryptsetup udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer static-libs"
+CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
+MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
+IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
+TOOLKIT_USE="qt5 sdl sdl2"
+NETWORK_USE="ipv6 avahi zeroconf http"
+SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
+DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -systemd -branding -handbook"
+
+USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
diff --git a/conf/intel/portage/make.conf.amd64-binmode b/conf/intel/portage/make.conf.amd64-binmode
index dce107a..4027dab 100644
--- a/conf/intel/portage/make.conf.amd64-binmode
+++ b/conf/intel/portage/make.conf.amd64-binmode
@@ -1,74 +1,20 @@
-## COMPILER STUFF ##
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe"
-CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j8 -s"
-
 ## PORTAGE FEATURES ##
 FEATURES="parallel-fetch protect-owned candy compressdebug splitdebug -userpriv"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkgonly --rebuilt-binaries"
-#PORTAGE_NICENESS="-19"
-
-## SYSTEM LANGUAGES ##
-LINGUAS="en en_US en_GB uk ro_RO ro"
-L10N="en en-US en-GB uk ro-RO ro"
-
-## USE FLAGS ##
-SYSTEM_USE="X wayland glamor openrc sysvinit consolekit cryptsetup udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer static-libs"
-CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
-MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
-IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
-TOOLKIT_USE="qt5 sdl sdl2"
-NETWORK_USE="ipv6 avahi zeroconf http"
-SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
-DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -systemd -branding -handbook"
-
-USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
-
-## CPU OPTIMISATIONS ##
-CPU_FLAGS_X86="mmx mmxext sse sse2 sse3"
-
-## DEVICES ##
-INPUT_DEVICES="evdev synaptics"
-VIDEO_CARDS="intel i915 i965 nouveau nvidia r100 r200 r300 r600 vesa amdgpu radeonsi radeon vmware"
-LIRC_DEVICES="audio audio_alsa serial pctv"
-
-## OFFICE ##
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport"
-
-## QEMU ##
-QEMU_USER_TARGETS="x86_64 i386"
-QEMU_SOFTMMU_TARGETS="x86_64 i386"
-
-## MIRRORS ##
-GENTOO_MIRRORS="http://mirror.bytemark.co.uk/gentoo/"
-
-## PYTHON TARGETS ##
-USE_PYTHON="2.7 3.4"
-PYTHON_TARGETS="python2_7 python3_4"
-
-## RUBY TARGETS ##
-RUBY_TARGETS="ruby22"
-
-## GRUB PLATFORMS ##
-GRUB_PLATFORMS="efi-32 efi-64 pc"
-
-## ABI SUPPORT ##
-ABI_X86="64 32"
-
-# Set PORTDIR for backward compatibility with various tools:
-#   gentoo-bashcomp - bug #478444
-#   euse - bug #474574
-#   euses and ufed - bug #478318
-PORTDIR="/usr/portage"
-DISTDIR="${PORTDIR}/distfiles"
-
-INSTALL_MASK="/etc/systemd
-              /usr/lib/systemd
-              /usr/lib64/systemd
-              /usr/lib/debug
-              /usr/lib64/debug"
 
 source /var/lib/layman/make.conf
-source /etc/portage/binhost.conf
+
+source /etc/portage/global.conf/abi.conf
+source /etc/portage/global.conf/binhost.conf
+source /etc/portage/global.conf/cflags.conf
+source /etc/portage/global.conf/cpuflags.conf
+source /etc/portage/global.conf/devices.conf
+source /etc/portage/global.conf/distfiles.conf
+source /etc/portage/global.conf/grub.conf
+source /etc/portage/global.conf/languages.conf
+source /etc/portage/global.conf/layout.conf
+source /etc/portage/global.conf/libreoffice.conf
+source /etc/portage/global.conf/python.conf
+source /etc/portage/global.conf/qemu.conf
+source /etc/portage/global.conf/ruby.conf
+source /etc/portage/global.conf/useflags.conf
diff --git a/conf/intel/portage/make.conf.amd64-mixedmode b/conf/intel/portage/make.conf.amd64-mixedmode
index 82cebc8..d279d0b 100644
--- a/conf/intel/portage/make.conf.amd64-mixedmode
+++ b/conf/intel/portage/make.conf.amd64-mixedmode
@@ -1,74 +1,20 @@
-## COMPILER STUFF ##
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe"
-CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j8 -s"
-
 ## PORTAGE FEATURES ##
 FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv"
 EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkg --rebuilt-binaries"
-#PORTAGE_NICENESS="-19"
-
-## SYSTEM LANGUAGES ##
-LINGUAS="en en_US en_GB uk ro_RO ro"
-L10N="en en-US en-GB uk ro-RO ro"
-
-## USE FLAGS ##
-SYSTEM_USE="X wayland glamor openrc sysvinit consolekit cryptsetup udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer static-libs"
-CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
-MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
-IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
-TOOLKIT_USE="qt5 sdl sdl2"
-NETWORK_USE="ipv6 avahi zeroconf http"
-SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
-DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -systemd -branding -handbook"
-
-USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
-
-## CPU OPTIMISATIONS ##
-CPU_FLAGS_X86="mmx mmxext sse sse2 sse3"
-
-## DEVICES ##
-INPUT_DEVICES="evdev synaptics"
-VIDEO_CARDS="intel i915 i965 nouveau nvidia r100 r200 r300 r600 vesa amdgpu radeonsi radeon vmware"
-LIRC_DEVICES="audio audio_alsa serial pctv"
-
-## OFFICE ##
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport"
-
-## QEMU ##
-QEMU_USER_TARGETS="x86_64 i386"
-QEMU_SOFTMMU_TARGETS="x86_64 i386"
-
-## MIRRORS ##
-GENTOO_MIRRORS="http://mirror.bytemark.co.uk/gentoo/"
-
-## PYTHON TARGETS ##
-USE_PYTHON="2.7 3.4"
-PYTHON_TARGETS="python2_7 python3_4"
-
-## RUBY TARGETS ##
-RUBY_TARGETS="ruby22"
-
-## GRUB PLATFORMS ##
-GRUB_PLATFORMS="efi-32 efi-64 pc"
-
-## ABI SUPPORT ##
-ABI_X86="64 32"
-
-# Set PORTDIR for backward compatibility with various tools:
-#   gentoo-bashcomp - bug #478444
-#   euse - bug #474574
-#   euses and ufed - bug #478318
-PORTDIR="/usr/portage"
-DISTDIR="${PORTDIR}/distfiles"
-
-INSTALL_MASK="/etc/systemd
-              /usr/lib/systemd
-              /usr/lib64/systemd
-              /usr/lib/debug
-              /usr/lib64/debug"
 
 source /var/lib/layman/make.conf
-source /etc/portage/binhost.conf
+
+source /etc/portage/global.conf/abi.conf
+source /etc/portage/global.conf/binhost.conf
+source /etc/portage/global.conf/cflags.conf
+source /etc/portage/global.conf/cpuflags.conf
+source /etc/portage/global.conf/devices.conf
+source /etc/portage/global.conf/distfiles.conf
+source /etc/portage/global.conf/grub.conf
+source /etc/portage/global.conf/languages.conf
+source /etc/portage/global.conf/layout.conf
+source /etc/portage/global.conf/libreoffice.conf
+source /etc/portage/global.conf/python.conf
+source /etc/portage/global.conf/qemu.conf
+source /etc/portage/global.conf/ruby.conf
+source /etc/portage/global.conf/useflags.conf
diff --git a/conf/intel/portage/make.conf.amd64-srcmode b/conf/intel/portage/make.conf.amd64-srcmode
index 3f9e6ae..3577716 100644
--- a/conf/intel/portage/make.conf.amd64-srcmode
+++ b/conf/intel/portage/make.conf.amd64-srcmode
@@ -1,72 +1,19 @@
-## COMPILER STUFF ##
-CFLAGS="-O2 -march=x86-64 -mtune=generic -pipe"
-CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j8 -s"
-
 ## PORTAGE FEATURES ##
 FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv"
-#PORTAGE_NICENESS="-19"
-
-## SYSTEM LANGUAGES ##
-LINGUAS="en en_US en_GB uk ro_RO ro"
-L10N="en en-US en-GB uk ro-RO ro"
-
-## USE FLAGS ##
-SYSTEM_USE="X wayland glamor openrc sysvinit consolekit cryptsetup udev dbus policykit polkit upower udisks python perl icu xattr acl introspection gudev threads truetype fontconfig curl cups openssl nettle gcrypt libnotify sqlite designer static-libs"
-CODECS_USE="a52 aac aacplus faac webp mms mp3 mpg123 fdk flac gsm vorbis theora lame ogg opus xvid vpx x264 x265 mpeg"
-MEDIA_USE="cairo drm dri dri3 vaapi vdpau egl opengl opencl xvmc v4l mtp rtmp dvd bluray bluetooth matroska libass xml xcb xkb"
-IMAGE_USE="jpeg jpeg2k png apng mng tiff gif svg pdf gphoto2 xmp"
-TOOLKIT_USE="qt5 sdl sdl2"
-NETWORK_USE="ipv6 avahi zeroconf http"
-SOUND_USE="alsa pulseaudio gstreamer ffmpeg openal sound"
-DONT_USE="-bindist -kde -qt4 -qt3support -gtk -gtk3 -gnome -gnome-keyring -connman -networkmanager -modemmanager -libav -tracker -mysql -systemd -branding -handbook"
-
-USE="${SYSTEM_USE} ${CODECS_USE} ${MEDIA_USE} ${IMAGE_USE} ${TOOLKIT_USE} ${NETWORK_USE} ${SOUND_USE} ${DONT_USE}"
-
-## CPU OPTIMISATIONS ##
-CPU_FLAGS_X86="mmx mmxext sse sse2 sse3"
-
-## DEVICES ##
-INPUT_DEVICES="evdev synaptics"
-VIDEO_CARDS="intel i915 i965 nouveau nvidia r100 r200 r300 r600 vesa amdgpu radeonsi radeon vmware"
-LIRC_DEVICES="audio audio_alsa serial pctv"
-
-## OFFICE ##
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport"
-
-## QEMU ##
-QEMU_USER_TARGETS="x86_64 i386"
-QEMU_SOFTMMU_TARGETS="x86_64 i386"
-
-## MIRRORS ##
-GENTOO_MIRRORS="http://mirror.bytemark.co.uk/gentoo/"
-
-## PYTHON TARGETS ##
-USE_PYTHON="2.7 3.4"
-PYTHON_TARGETS="python2_7 python3_4"
-
-## RUBY TARGETS ##
-RUBY_TARGETS="ruby22"
-
-## GRUB PLATFORMS ##
-GRUB_PLATFORMS="efi-32 efi-64 pc"
-
-## ABI SUPPORT ##
-ABI_X86="64 32"
-
-# Set PORTDIR for backward compatibility with various tools:
-#   gentoo-bashcomp - bug #478444
-#   euse - bug #474574
-#   euses and ufed - bug #478318
-PORTDIR="/usr/portage"
-DISTDIR="${PORTDIR}/distfiles"
-
-INSTALL_MASK="/etc/systemd
-              /usr/lib/systemd
-              /usr/lib64/systemd
-              /usr/lib/debug
-              /usr/lib64/debug"
 
 source /var/lib/layman/make.conf
+
+source /etc/portage/global.conf/abi.conf
+source /etc/portage/global.conf/binhost.conf
+source /etc/portage/global.conf/cflags.conf
+source /etc/portage/global.conf/cpuflags.conf
+source /etc/portage/global.conf/devices.conf
+source /etc/portage/global.conf/distfiles.conf
+source /etc/portage/global.conf/grub.conf
+source /etc/portage/global.conf/languages.conf
+source /etc/portage/global.conf/layout.conf
+source /etc/portage/global.conf/libreoffice.conf
+source /etc/portage/global.conf/python.conf
+source /etc/portage/global.conf/qemu.conf
+source /etc/portage/global.conf/ruby.conf
+source /etc/portage/global.conf/useflags.conf