Removed make.conf.* old

2 files changed, 0 insertions, 166 deletions

diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64
deleted file mode 100644
index 4fbeced..0000000
--- a/conf/intel/portage/make.conf.amd64
+++ /dev/null
@@ -1,83 +0,0 @@
-# These settings were set by the catalyst build script that automatically built this stage
-# Please consult /etc/make.conf.example for a more detailed example
-
-# Compiler stuff
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-# Only enable Graphite via package.env
-CFLAGS="-O2 -march=x86-64 -pipe" # -ftree-vectorize ${GRAPHITE}"
-CHOST="x86_64-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j9 -s"
-
-# Portage stuff
-FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug"
-CCACHE_SIZE="2G"
-CCACHE_DIR="/var/ccache"
-
-LINGUAS="en en_US ro"
-
-## USE ##
-SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd -libav"
-SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr dvi mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
-SAB_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack"
-SAB_SYSTEM="cjk icu xattr unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
-SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify"
-SAB_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner"
-SAB_XSYS="cairo X opengl png gif gtk qt4 qt3support xpm tiff xinerama aiglx svg gphoto2 dga lcd openexr" 
-SAB_DESKTOP="gudev introspection kdehiddenvisibility gmp libnotify rdesktop pda zeroconf kdeenablefinal visualization avahi startup-notification accessibility"
-SAB_BROWSER="nsplugin firefox mozdevelop xulrunner"
-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 keyboard mouse 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"
-
-## OFFICE ##
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport wiki-publisher"
-
-## QEMU ##
-QEMU_USER_TARGETS="alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus sparc64 x86_64"
-QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64"
-
-## PORTAGE CONFIG ##
-CONFIG_PROTECT="/usr/share/config/kdm /etc"
-# /lib/modules mask is useful for our internal tinderbox
-CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
-APACHE2_MPMS="prefork"
-GENTOO_MIRRORS="ftp://ftp.spline.inf.fu-berlin.de/mirrors/gentoo/ http://archive.mmu.edu.my/gentoo rsync://gentoo.bloodhost.ru/gentoo-distfiles ftp://gentoo.mirrors.tds.net/gentoo ftp://ftp.halifax.rwth-aachen.de/gentoo/ rsync://mirror.neolabs.kz/gentoo http://ftp.gentoo.bg/ http://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://ftp.cc.uoc.gr/mirrors/linux/gentoo/ ftp://mirrors.tera-byte.com/pub/gentoo"
-
-USE_PYTHON="2.7 3.3"
-PYTHON_TARGETS="python2_7 python3_3"
-
-# Some more forced targets
-PHP_TARGETS="php5-4"
-RUBY_TARGETS="ruby19 ruby20"
-
-# Apache suEXEC default UMASK
-# See bug 3544
-SUEXEC_UMASK=022
-
-# Setup GRUB platforms
-GRUB_PLATFORMS="efi-32 efi-64 pc coreboot"
-
-# Support both 64bit and 32bit
-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/init.d
-	      /etc/conf.d
-	      /etc/runlevels"
-
-source /var/lib/layman/make.conf
diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86
deleted file mode 100644
index e3df27a..0000000
--- a/conf/intel/portage/make.conf.x86
+++ /dev/null
@@ -1,83 +0,0 @@
-# These settings were set by the catalyst build script that automatically built this stage
-# Please consult /etc/make.conf.example for a more detailed example
-
-# Compiler stuff
-GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block"
-# Only enable Graphite via package.env
-CFLAGS="-O2 -march=i686 -pipe" # -ftree-vectorize ${GRAPHITE}"
-CHOST="i686-pc-linux-gnu"
-CXXFLAGS="${CFLAGS}"
-LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-MAKEOPTS="-j9 -s"
-
-# Portage stuff
-FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug"
-CCACHE_SIZE="2G"
-CCACHE_DIR="/var/ccache"
-
-LINGUAS="en en_US ro"
-
-## USE ##
-SAB_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd -libav"
-SAB_MEDIA="musicbrainz sdl pulseaudio wmf fame cdr mp3rtp xine cddb alsa dvb dvd bluray network dvdread ipod audiofile artswrappersuid dvdr jack dri cdda mjpeg mmx joystick xvmc cpudetection v4l v4l2"
-#dvi
-SAB_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 win32codecs matroska xvid flac ffmpeg aac speex real dts musepack"
-SAB_SYSTEM="cjk icu xattr unicode gnutls nptl gcj udev systemd logind -consolekit kerberos acl dbus bash-completion lzo rar policykit xcb bzip2 bidi wifi lm_sensors acpi usb pcmcia bluetooth irda ieee1394 perl python"
-SAB_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify"
-SAB_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner"
-SAB_XSYS="cairo X opengl gif gtk qt4 qt3support xpm tiff xinerama aiglx svg gphoto2 dga lcd openexr"
-##NOTE## png is set in amd64 but not in i686
-SAB_DESKTOP="gudev introspection kdehiddenvisibility gmp libnotify rdesktop pda zeroconf kdeenablefinal visualization avahi startup-notification accessibility"
-SAB_BROWSER="nsplugin firefox mozdevelop xulrunner"
-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 keyboard mouse 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"
-#VIDEO_CARDS="apm ark chips cirrus cyrix dummy fbdev glint i128 i740 i810 imstt mach64 mga neomagic nsc nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa vga via vmware voodoo epson vermilion xgi nvidia"
-APACHE2_MPMS="prefork"
-
-## OFFICE ##
-LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer pdfimport wiki-publisher"
-
-## QEMU ##
-QEMU_USER_TARGETS="alpha arm armeb cris i386 m68k microblaze mips mipsel ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus sparc64 x86_64"
-QEMU_SOFTMMU_TARGETS="x86_64 arm cris i386 m68k microblaze mips mips64 mips64el mipsel ppc ppc64 ppcemb sh4 sh4eb sparc sparc64"
-
-## PORTAGE CONFIG ##
-CONFIG_PROTECT="/usr/share/config/kdm /etc"
-# /lib/modules mask is useful for our internal tinderbox
-CONFIG_PROTECT_MASK="/etc/skel /lib/modules"
-GENTOO_MIRRORS="http://ftp.heanet.ie/pub/gentoo/ ftp://ftp.halifax.rwth-aachen.de/gentoo/ ftp://mirror.cambrium.nl/pub/os/linux/gentoo/ ftp://mirror.opteamax.de/gentoo/ http://ftp.heanet.ie/pub/gentoo/"
-
-USE_PYTHON="2.7 3.3"
-PYTHON_TARGETS="python2_7 python3_3"
-
-# Other forced targets
-PHP_TARGETS="php5-4"
-RUBY_TARGETS="ruby19 ruby20"
-
-# Apache suEXEC default UMASK
-# See bug 3544
-SUEXEC_UMASK=022
-
-# Setup GRUB platforms
-GRUB_PLATFORMS="pc coreboot"
-
-# 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/init.d
-	      /etc/conf.d
-	      /etc/runlevels"
-
-source /var/lib/layman/make.conf