Merge branch 'master' of git+ssh://git.gentoo.org/proj/releng

tools-hardened/desktop/configs/loop-AES-kernel.patch

@@ -3,9 +3,9 @@ include/linux/loop.h source files must be removed:
 
     rm -f drivers/block/loop.c include/linux/loop.h
 
-diff -urN linux-3.14-noloop/drivers/block/Kconfig linux-3.14-AES/drivers/block/Kconfig
---- linux-3.14-noloop/drivers/block/Kconfig	2014-03-31 06:40:15.000000000 +0300
-+++ linux-3.14-AES/drivers/block/Kconfig	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/block/Kconfig linux-3.19-AES/drivers/block/Kconfig
+--- linux-3.19-noloop/drivers/block/Kconfig	2015-02-09 04:54:22.000000000 +0200
++++ linux-3.19-AES/drivers/block/Kconfig	2015-02-09 20:49:52.000000000 +0200
 @@ -235,14 +235,6 @@
  	  bits of, say, a sound file). This is also safe if the file resides
  	  on a remote file server.
@@ -88,10 +88,10 @@ diff -urN linux-3.14-noloop/drivers/block/Kconfig linux-3.14-AES/drivers/block/K
  
  source "drivers/block/drbd/Kconfig"
  
-diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/loop.c
---- linux-3.14-noloop/drivers/block/loop.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/block/loop.c	2014-03-31 22:20:36.000000000 +0300
-@@ -0,0 +1,3278 @@
+diff -urN linux-3.19-noloop/drivers/block/loop.c linux-3.19-AES/drivers/block/loop.c
+--- linux-3.19-noloop/drivers/block/loop.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/block/loop.c	2015-02-09 20:49:52.000000000 +0200
+@@ -0,0 +1,3279 @@
 +/*
 + *  linux/drivers/block/loop.c
 + *
@@ -2581,7 +2581,7 @@ diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/lo
 +	blk_queue_max_segment_size(lo->lo_queue, PAGE_CACHE_SIZE);
 +	blk_queue_segment_boundary(lo->lo_queue, PAGE_CACHE_SIZE - 1);
 +	blk_queue_max_segments(lo->lo_queue, BLK_MAX_SEGMENTS);
-+	blk_queue_max_hw_sectors(lo->lo_queue, BLK_DEF_MAX_SECTORS);
++	blk_queue_max_hw_sectors(lo->lo_queue, 1024);
 +	lo->lo_queue->limits.cluster = 0;
 +	blk_queue_flush(lo->lo_queue, 0);
 +	lo->lo_backingQueue = 0;
@@ -2593,6 +2593,7 @@ diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/lo
 +		struct request_queue *q = bdev_get_queue(lo_device);
 +
 +		blk_queue_logical_block_size(lo->lo_queue, queue_logical_block_size(q));
++		blk_queue_physical_block_size(lo->lo_queue, queue_physical_block_size(q));
 +		blk_queue_flush(lo->lo_queue, q->flush_flags & (REQ_FLUSH | REQ_FUA));
 +		lo->lo_queue->limits.io_min = q->limits.io_min;
 +		if(lo->lo_queue->limits.io_min > (BLK_MAX_SEGMENTS * PAGE_CACHE_SIZE))
@@ -3370,9 +3371,9 @@ diff -urN linux-3.14-noloop/drivers/block/loop.c linux-3.14-AES/drivers/block/lo
 +}
 +EXPORT_SYMBOL(loop_add_keyscrub_fn);
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/Makefile linux-3.14-AES/drivers/misc/Makefile
---- linux-3.14-noloop/drivers/misc/Makefile	2014-03-31 06:40:15.000000000 +0300
-+++ linux-3.14-AES/drivers/misc/Makefile	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/Makefile linux-3.19-AES/drivers/misc/Makefile
+--- linux-3.19-noloop/drivers/misc/Makefile	2015-02-09 04:54:22.000000000 +0200
++++ linux-3.19-AES/drivers/misc/Makefile	2015-02-09 20:49:52.000000000 +0200
 @@ -2,6 +2,33 @@
  # Makefile for misc devices that really don't fit anywhere else.
  #
@@ -3407,9 +3408,9 @@ diff -urN linux-3.14-noloop/drivers/misc/Makefile linux-3.14-AES/drivers/misc/Ma
  obj-$(CONFIG_IBM_ASM)		+= ibmasm/
  obj-$(CONFIG_AD525X_DPOT)	+= ad525x_dpot.o
  obj-$(CONFIG_AD525X_DPOT_I2C)	+= ad525x_dpot-i2c.o
-diff -urN linux-3.14-noloop/drivers/misc/aes-amd64.S linux-3.14-AES/drivers/misc/aes-amd64.S
---- linux-3.14-noloop/drivers/misc/aes-amd64.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/aes-amd64.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/aes-amd64.S linux-3.19-AES/drivers/misc/aes-amd64.S
+--- linux-3.19-noloop/drivers/misc/aes-amd64.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/aes-amd64.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,897 @@
 +//
 +// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
@@ -4308,9 +4309,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-amd64.S linux-3.14-AES/drivers/misc
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/aes-intel32.S linux-3.14-AES/drivers/misc/aes-intel32.S
---- linux-3.14-noloop/drivers/misc/aes-intel32.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/aes-intel32.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/aes-intel32.S linux-3.19-AES/drivers/misc/aes-intel32.S
+--- linux-3.19-noloop/drivers/misc/aes-intel32.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/aes-intel32.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,655 @@
 +/*
 + * Implement AES algorithm in Intel AES-NI instructions.
@@ -4967,9 +4968,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-intel32.S linux-3.14-AES/drivers/mi
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/aes-intel64.S linux-3.14-AES/drivers/misc/aes-intel64.S
---- linux-3.14-noloop/drivers/misc/aes-intel64.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/aes-intel64.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/aes-intel64.S linux-3.19-AES/drivers/misc/aes-intel64.S
+--- linux-3.19-noloop/drivers/misc/aes-intel64.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/aes-intel64.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,649 @@
 +/*
 + * Implement AES algorithm in Intel AES-NI instructions.
@@ -5620,9 +5621,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-intel64.S linux-3.14-AES/drivers/mi
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/aes-x86.S linux-3.14-AES/drivers/misc/aes-x86.S
---- linux-3.14-noloop/drivers/misc/aes-x86.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/aes-x86.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/aes-x86.S linux-3.19-AES/drivers/misc/aes-x86.S
+--- linux-3.19-noloop/drivers/misc/aes-x86.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/aes-x86.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,927 @@
 +//
 +// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
@@ -6551,9 +6552,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes-x86.S linux-3.14-AES/drivers/misc/a
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/aes.c linux-3.14-AES/drivers/misc/aes.c
---- linux-3.14-noloop/drivers/misc/aes.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/aes.c	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/aes.c linux-3.19-AES/drivers/misc/aes.c
+--- linux-3.19-noloop/drivers/misc/aes.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/aes.c	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,1479 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -8034,9 +8035,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes.c linux-3.14-AES/drivers/misc/aes.c
 +
 +    state_out(out_blk, b0);
 +}
-diff -urN linux-3.14-noloop/drivers/misc/aes.h linux-3.14-AES/drivers/misc/aes.h
---- linux-3.14-noloop/drivers/misc/aes.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/aes.h	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/aes.h linux-3.19-AES/drivers/misc/aes.h
+--- linux-3.19-noloop/drivers/misc/aes.h	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/aes.h	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,112 @@
 +// I retain copyright in this code but I encourage its free use provided
 +// that I don't carry any responsibility for the results. I am especially 
@@ -8150,9 +8151,9 @@ diff -urN linux-3.14-noloop/drivers/misc/aes.h linux-3.14-AES/drivers/misc/aes.h
 +// if their parameters have not changed.
 +
 +#endif  // _AES_H
-diff -urN linux-3.14-noloop/drivers/misc/crypto-ksym.c linux-3.14-AES/drivers/misc/crypto-ksym.c
---- linux-3.14-noloop/drivers/misc/crypto-ksym.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/crypto-ksym.c	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/crypto-ksym.c linux-3.19-AES/drivers/misc/crypto-ksym.c
+--- linux-3.19-noloop/drivers/misc/crypto-ksym.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/crypto-ksym.c	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,18 @@
 +#include <linux/module.h>
 +#include "aes.h"
@@ -8172,9 +8173,9 @@ diff -urN linux-3.14-noloop/drivers/misc/crypto-ksym.c linux-3.14-AES/drivers/mi
 +EXPORT_SYMBOL(intel_aes_cbc_decrypt);
 +EXPORT_SYMBOL(intel_aes_cbc_enc_4x512);
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/md5-2x-amd64.S linux-3.14-AES/drivers/misc/md5-2x-amd64.S
---- linux-3.14-noloop/drivers/misc/md5-2x-amd64.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/md5-2x-amd64.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/md5-2x-amd64.S linux-3.19-AES/drivers/misc/md5-2x-amd64.S
+--- linux-3.19-noloop/drivers/misc/md5-2x-amd64.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/md5-2x-amd64.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,223 @@
 +//
 +//  md5-2x-amd64.S
@@ -8399,9 +8400,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5-2x-amd64.S linux-3.14-AES/drivers/m
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/md5-amd64.S linux-3.14-AES/drivers/misc/md5-amd64.S
---- linux-3.14-noloop/drivers/misc/md5-amd64.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/md5-amd64.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/md5-amd64.S linux-3.19-AES/drivers/misc/md5-amd64.S
+--- linux-3.19-noloop/drivers/misc/md5-amd64.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/md5-amd64.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,204 @@
 +//
 +//  md5-amd64.S
@@ -8607,9 +8608,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5-amd64.S linux-3.14-AES/drivers/misc
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/md5-x86.S linux-3.14-AES/drivers/misc/md5-x86.S
---- linux-3.14-noloop/drivers/misc/md5-x86.S	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/md5-x86.S	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/md5-x86.S linux-3.19-AES/drivers/misc/md5-x86.S
+--- linux-3.19-noloop/drivers/misc/md5-x86.S	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/md5-x86.S	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,211 @@
 +//
 +//  md5-x86.S
@@ -8822,9 +8823,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5-x86.S linux-3.14-AES/drivers/misc/m
 +#if defined(__ELF__) && defined(SECTION_NOTE_GNU_STACK)
 +	.section .note.GNU-stack,"",@progbits
 +#endif
-diff -urN linux-3.14-noloop/drivers/misc/md5.c linux-3.14-AES/drivers/misc/md5.c
---- linux-3.14-noloop/drivers/misc/md5.c	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/md5.c	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/md5.c linux-3.19-AES/drivers/misc/md5.c
+--- linux-3.19-noloop/drivers/misc/md5.c	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/md5.c	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,106 @@
 +/*
 + * MD5 Message Digest Algorithm (RFC1321).
@@ -8932,9 +8933,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5.c linux-3.14-AES/drivers/misc/md5.c
 +    hash[2] += c;
 +    hash[3] += d;
 +}
-diff -urN linux-3.14-noloop/drivers/misc/md5.h linux-3.14-AES/drivers/misc/md5.h
---- linux-3.14-noloop/drivers/misc/md5.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/drivers/misc/md5.h	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/drivers/misc/md5.h linux-3.19-AES/drivers/misc/md5.h
+--- linux-3.19-noloop/drivers/misc/md5.h	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/drivers/misc/md5.h	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,15 @@
 +/* md5.h */
 +
@@ -8951,9 +8952,9 @@ diff -urN linux-3.14-noloop/drivers/misc/md5.h linux-3.14-AES/drivers/misc/md5.h
 + asmlinkage
 +#endif
 +extern void md5_transform_CPUbyteorder_2x(u_int32_t *, u_int32_t const *, u_int32_t const *);
-diff -urN linux-3.14-noloop/include/linux/loop.h linux-3.14-AES/include/linux/loop.h
---- linux-3.14-noloop/include/linux/loop.h	1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.14-AES/include/linux/loop.h	2014-03-31 22:20:36.000000000 +0300
+diff -urN linux-3.19-noloop/include/linux/loop.h linux-3.19-AES/include/linux/loop.h
+--- linux-3.19-noloop/include/linux/loop.h	1970-01-01 02:00:00.000000000 +0200
++++ linux-3.19-AES/include/linux/loop.h	2015-02-09 20:49:52.000000000 +0200
 @@ -0,0 +1,171 @@
 +#ifndef _LINUX_LOOP_H
 +#define _LINUX_LOOP_H

tools-hardened/desktop/files/gnome-world

@@ -1,21 +1,29 @@
 app-admin/metalog
 app-admin/sudo
 app-admin/sysstat
+app-arch/file-roller
 app-arch/sharutils
+app-arch/unrar
 app-cdr/cdrtools
+app-editors/mousepad
 app-editors/nano
 app-editors/vim
 app-office/abiword
 app-office/gnumeric
 app-portage/gentoolkit
 app-text/tree
-gnome-base/gnome
+gnome-base/gnome-light
 mail-client/mailx
+mail-client/sylpheed
 mail-mta/postfix
+media-gfx/ristretto
 media-sound/alsa-utils
+media-video/vlc
+net-irc/hexchat
 net-misc/dhcpcd
 net-misc/openssh
 net-misc/tor
+sci-calculator/galculator
 sys-apps/gradm
 sys-apps/iproute2
 sys-boot/grub

tools-hardened/desktop/files/kernel-config

@@ -1 +1 @@
-3.17.7-hardened-r1.config
+3.19.2-hardened-r1.config

tools-hardened/desktop/files/portage/package.gnome.use.1

@@ -8,7 +8,7 @@ dev-libs/openssl -bindist
 x11-base/xorg-server xorg
 sys-libs/zlib minizip
 x11-libs/cairo opengl
-media-libs/mesa gbm
+media-libs/mesa gbm gles2
 app-misc/tracker -ffmpeg
 media-libs/grilo playlist
 www-servers/apache apache2_modules_auth_digest
@@ -18,3 +18,6 @@ sys-apps/systemd introspection
 sys-fs/udev introspection
 dev-libs/libgdata gnome
 net-misc/dhcp client
+x11-libs/libxcb xkb
+media-libs/clutter egl
+media-libs/cogl gles2

tools-hardened/desktop/files/portage/package.gnome.use.2

@@ -8,7 +8,7 @@ dev-libs/openssl -bindist
 x11-base/xorg-server xorg
 sys-libs/zlib minizip
 x11-libs/cairo opengl
-media-libs/mesa gbm
+media-libs/mesa gbm gles2
 app-misc/tracker -ffmpeg
 media-libs/grilo playlist
 www-servers/apache apache2_modules_auth_digest
@@ -18,3 +18,6 @@ sys-apps/systemd introspection
 sys-fs/udev introspection
 dev-libs/libgdata gnome
 net-misc/dhcp client
+x11-libs/libxcb xkb
+media-libs/clutter egl
+media-libs/cogl gles2

tools-hardened/desktop/gnome3-run.sh

@@ -54,6 +54,11 @@ setup_confs() {
 	sed -i 's/^\(sessiondir.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
 	sed -i '/# sessiondir.*/ a\sessiondir /etc/X11/Sessions' "${ROOTFS}"/etc/slim.conf
 
+    if [ ! -d "${ROOTFS}/usr/share/backgrounds" ];
+    then
+        mkdir -p "${ROOTFS}"/usr/share/backgrounds
+    fi
+
 	wget -O "${ROOTFS}"/usr/share/backgrounds/background.jpg "${IMAGE}"
 
 	sed -i '/^SYNC/d' "${ROOTFS}"/etc/portage/make.conf

tools-hardened/desktop/run-base.sh

@@ -85,7 +85,6 @@ build_kernel() {
 setup_initrc() {
 	ln -sf net.lo "${ROOTFS}"/etc/init.d/net.eth0
 	chroot "${ROOTFS}"/ rc-update add acpid boot
-	chroot "${ROOTFS}"/ rc-update add device-mapper boot
 	chroot "${ROOTFS}"/ rc-update add lvm boot
 	chroot "${ROOTFS}"/ rc-update add udev sysinit
 	chroot "${ROOTFS}"/ rc-update add cronie default

tools-musl/portage.amd64.hardened/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.amd64.vanilla/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.armv7a.vanilla/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.i686.hardened/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.i686.vanilla/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.mips32r2.vanilla/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.mips32r2.vanilla/package.mask

@@ -1,2 +1,5 @@
->sys-devel/gcc-4.8.3-r99
+>app-editors/nano-2.3.6
+>sys-apps/iproute2-3.17.0
+>sys-apps/util-linux-2.24.1-r99
+>sys-devel/gcc-4.8.4-r99
 >sys-fs/eudev-1.10-r2

tools-musl/portage.mipsel3.vanilla/bashrc

@@ -8,7 +8,7 @@ post_src_install() {
 	/usr/lib
 	/usr/local/lib
 	/usr/lib/opengl/xorg-x11/lib
-	/usr/lib/gcc/${CHOST}/4.8.3
+	/usr/lib/gcc/${CHOST}/4.8.4
 	/usr/${CHOST}/lib
 	/usr/games/lib
 	EOF

tools-musl/portage.mipsel3.vanilla/package.mask

@@ -1,3 +1,5 @@
+>app-editors/nano-2.3.6
+>sys-apps/iproute2-3.17.0
 >sys-apps/util-linux-2.24.1-r99
->sys-devel/gcc-4.8.3-r99
+>sys-devel/gcc-4.8.4-r99
 >sys-fs/eudev-1.10-r2