From ec9529c6520e571e92c2a62377aba1cd6ef61a25 Mon Sep 17 00:00:00 2001
From: root <root@sandbox.local.calculate.ru>
Date: Fri, 12 Sep 2014 16:26:48 +0400
Subject: [PATCH] Sync with portage [Fri Sep 12 16:26:47 MSK 2014].

---
 app-emulation/qemu/Manifest                   |   1 +
 .../qemu/files/qemu-2.1.1-readlink-self.patch |  81 +++
 app-emulation/qemu/qemu-2.1.1.ebuild          | 595 ++++++++++++++++++
 games-board/ccgo/Manifest                     |   2 +-
 games-board/ccgo/ccgo-0.3.6.4.ebuild          |  23 +-
 games-board/crafty/Manifest                   |   1 +
 games-board/crafty/crafty-24.0.ebuild         |  84 +++
 games-board/pouetchess/Manifest               |   2 +-
 .../pouetchess/pouetchess-0.2.0-r1.ebuild     |  32 +-
 media-libs/x265/Manifest                      |   4 +-
 media-libs/x265/files/x265-libdir.patch       |  35 --
 .../x265/files/x265-libdir_pkgconfig.patch    |  12 -
 media-libs/x265/metadata.xml                  |   2 +-
 media-libs/x265/x265-0.8.ebuild               |  76 ---
 media-libs/x265/x265-1.0.ebuild               |  72 ---
 .../x265/{x265-1.2.ebuild => x265-1.3.ebuild} |   4 +-
 media-libs/x265/x265-9999.ebuild              |   4 +-
 metadata/dtd/timestamp.chk                    |   2 +-
 metadata/glsa/timestamp.chk                   |   2 +-
 metadata/md5-cache/app-emulation/qemu-2.1.1   |  14 +
 metadata/md5-cache/games-board/ccgo-0.3.6.4   |   4 +-
 metadata/md5-cache/games-board/crafty-24.0    |  14 +
 .../md5-cache/games-board/pouetchess-0.2.0-r1 |   8 +-
 metadata/md5-cache/media-libs/x265-0.8        |  12 -
 metadata/md5-cache/media-libs/x265-1.0        |  12 -
 .../media-libs/{x265-1.2 => x265-1.3}         |   6 +-
 metadata/md5-cache/media-libs/x265-9999       |   4 +-
 metadata/md5-cache/sys-apps/portage-9999      |   2 +-
 metadata/news/timestamp.chk                   |   2 +-
 metadata/timestamp                            |   2 +-
 metadata/timestamp.chk                        |   2 +-
 metadata/timestamp.x                          |   2 +-
 profiles/package.mask                         |   9 +-
 profiles/use.local.desc                       |   2 +-
 sys-apps/portage/portage-9999.ebuild          |   7 +-
 35 files changed, 855 insertions(+), 281 deletions(-)
 create mode 100644 app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch
 create mode 100644 app-emulation/qemu/qemu-2.1.1.ebuild
 create mode 100644 games-board/crafty/crafty-24.0.ebuild
 delete mode 100644 media-libs/x265/files/x265-libdir.patch
 delete mode 100644 media-libs/x265/files/x265-libdir_pkgconfig.patch
 delete mode 100644 media-libs/x265/x265-0.8.ebuild
 delete mode 100644 media-libs/x265/x265-1.0.ebuild
 rename media-libs/x265/{x265-1.2.ebuild => x265-1.3.ebuild} (92%)
 create mode 100644 metadata/md5-cache/app-emulation/qemu-2.1.1
 create mode 100644 metadata/md5-cache/games-board/crafty-24.0
 delete mode 100644 metadata/md5-cache/media-libs/x265-0.8
 delete mode 100644 metadata/md5-cache/media-libs/x265-1.0
 rename metadata/md5-cache/media-libs/{x265-1.2 => x265-1.3} (88%)

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index f948939170bc..e02b41c3ecda 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1,3 @@
 DIST qemu-2.0.0.tar.bz2 12839647 SHA256 60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b SHA512 8fe2e8faa66251aaea7d6017ee71675d5b05f93f92be7e2ad3e1d02af185b3d6c4069bd83a13fb1e35a3e8947aff76f22446b395f97ac18b6f7a99744202e3fa WHIRLPOOL 6b39916acdcaa5e22510afec8a972935e71064de9ff0a3f9a698a8142f66b130a24d0a38cc56a7a92dbdc78d5145abe743a9c6933f819ce9e682b7cffdac1508
 DIST qemu-2.1.0.tar.bz2 23563306 SHA256 397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802 SHA512 8c00fd61432420229d762fa2ccf91cb8cec20206e2ec02ab2df13c6b3b9de7605fbfacb0fadd21f20f13c1de4c5216d8b11538738c0d0e5094582ded7c668f2e WHIRLPOOL 9d28aab8e20a5a60e85709d7a192a45425605693e54452f54decd65ecc77b504f1bc6ff60f5e9428314fb04911f966753f39a189adc8aa85776fd3c49b5a6858
+DIST qemu-2.1.1.tar.bz2 23567029 SHA256 be57bac8a8a1b47d76eecaa58b7eda390b7be8e5fdcbecfdf1a174380fc493e9 SHA512 4307b4d3d1227d69007391d87e1a3936dfbf188bbf512a0d97fbfdb475e7bf74593d5c5578b4e3aee396caa654a50ae3c132043087c1da78c182dad91b322295 WHIRLPOOL a1ff00a6f21e6667db87581f5975775c51ec0ef703ee6715ee8cc0b3cdca8b1c08607abfda956e8da2daa7be4f794e8f693f23d6fd15981c5c50b98388b0418d
diff --git a/app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch b/app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch
new file mode 100644
index 000000000000..451a9682509f
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch
@@ -0,0 +1,81 @@
+fix already in upstream
+
+From f17f4989fa193fa8279474c5462289a3cfe69aea Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 8 Aug 2014 09:40:25 +0900
+Subject: [PATCH] linux-user: fix readlink handling with magic exe symlink
+
+The current code always returns the length of the path when it should
+be returning the number of bytes it wrote to the output string.
+
+Further, readlink is not supposed to append a NUL byte, but the current
+snprintf logic will always do just that.
+
+Even further, if you pass in a length of 0, you're suppoesd to get back
+an error (EINVAL), but the current logic just returns 0.
+
+Further still, if there was an error reading the symlink, we should not
+go ahead and try to read the target buffer as it is garbage.
+
+Simple test for the first two issues:
+$ cat test.c
+int main() {
+    char buf[50];
+    size_t len;
+    for (len = 0; len < 10; ++len) {
+        memset(buf, '!', sizeof(buf));
+        ssize_t ret = readlink("/proc/self/exe", buf, len);
+        buf[20] = '\0';
+        printf("readlink(/proc/self/exe, {%s}, %zu) = %zi\n", buf, len, ret);
+    }
+    return 0;
+}
+
+Now compare the output of the native:
+$ gcc test.c -o /tmp/x
+$ /tmp/x
+$ strace /tmp/x
+
+With what qemu does:
+$ armv7a-cros-linux-gnueabi-gcc test.c -o /tmp/x -static
+$ qemu-arm /tmp/x
+$ qemu-arm -strace /tmp/x
+
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
+---
+ linux-user/syscall.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index fccf9f0..7c108ab 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -6636,11 +6636,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
+             p2 = lock_user(VERIFY_WRITE, arg2, arg3, 0);
+             if (!p || !p2) {
+                 ret = -TARGET_EFAULT;
++            } else if (!arg3) {
++                /* Short circuit this for the magic exe check. */
++                ret = -TARGET_EINVAL;
+             } else if (is_proc_myself((const char *)p, "exe")) {
+                 char real[PATH_MAX], *temp;
+                 temp = realpath(exec_path, real);
+-                ret = temp == NULL ? get_errno(-1) : strlen(real) ;
+-                snprintf((char *)p2, arg3, "%s", real);
++                /* Return value is # of bytes that we wrote to the buffer. */
++                if (temp == NULL) {
++                    ret = get_errno(-1);
++                } else {
++                    /* Don't worry about sign mismatch as earlier mapping
++                     * logic would have thrown a bad address error. */
++                    ret = MIN(strlen(real), arg3);
++                    /* We cannot NUL terminate the string. */
++                    memcpy(p2, real, ret);
++                }
+             } else {
+                 ret = get_errno(readlink(path(p), p2, arg3));
+             }
+-- 
+2.0.0
+
diff --git a/app-emulation/qemu/qemu-2.1.1.ebuild b/app-emulation/qemu/qemu-2.1.1.ebuild
new file mode 100644
index 000000000000..c93f66c97ba8
--- /dev/null
+++ b/app-emulation/qemu/qemu-2.1.1.ebuild
@@ -0,0 +1,595 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.1.ebuild,v 1.1 2014/09/12 07:01:42 vapier Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo pax-utils
+
+BACKPORTS=
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
+gtk infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
++png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+
+use_targets="
+	$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+	$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+"
+IUSE+=" ${use_targets}"
+
+# Require at least one softmmu or user target.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="|| ( ${use_targets} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qemu_softmmu_targets_arm? ( fdt )
+	qemu_softmmu_targets_microblaze? ( fdt )
+	qemu_softmmu_targets_ppc? ( fdt )
+	qemu_softmmu_targets_ppc64? ( fdt )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
+	virtfs? ( xattr )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+	infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
+	jpeg? ( virtual/jpeg[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[static-libs(+)] )
+	png? ( media-libs/libpng[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.7.5
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
+	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	accessibility? ( app-accessibility/brltty )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.90
+	)
+	iscsi? ( net-libs/libiscsi )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	sdl? ( media-libs/libsdl[X] )
+	selinux? ( sec-policy/selinux-qemu )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
+	spice? ( >=app-emulation/spice-protocol-0.12.3 )
+	systemtap? ( dev-util/systemtap )
+	usbredir? ( >=sys-apps/usbredir-0.6 )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools )"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
+	static-user? ( ${USER_LIB_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img
+	usr/share/qemu/u-boot.e500
+"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local buildtype=$1
+	local builddir=$2
+	local static_flag="static-${buildtype}"
+
+	# audio options
+	local audio_opts="oss"
+	use alsa && audio_opts="alsa,${audio_opts}"
+	use sdl && audio_opts="sdl,${audio_opts}"
+	use pulseaudio && audio_opts="pa,${audio_opts}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl glx)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls quorum)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu tls vnc-ws)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--target-list="${user_targets}"
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--target-list="${softmmu_targets}"
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=3.0 )
+		;;
+	esac
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if use ${static_flag}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	einfo "./configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_export_best
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	done
+
+	[[ -n ${softmmu_targets} ]] && \
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+
+	[[ -n ${user_targets} ]] && \
+		einfo "Building the following user targets: ${user_targets}"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		mkdir "${S}/softmmu-build"
+		qemu_src_configure "softmmu" "${S}/softmmu-build"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		mkdir "${S}/user-build"
+		qemu_src_configure "user" "${S}/user-build"
+	fi
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+}
+
+src_test() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.txt
+
+	# Remove SeaBIOS since we're using the SeaBIOS packaged one
+	rm "${ED}/usr/share/qemu/bios.bin"
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
+
+	# Remove vgabios since we're using the vgabios packaged one
+	if [[ -n ${softmmu_targets} ]]; then
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+			dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+			dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+			dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+			dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+		fi
+
+		# Remove sgabios since we're using the sgabios packaged one
+		rm "${ED}/usr/share/qemu/sgabios.bin"
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+		fi
+
+		# Remove iPXE since we're using the iPXE packaged one
+		rm "${ED}"/usr/share/qemu/pxe-*.rom
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+		fi
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
+		ewarn "save states has been removed starting with the 1.6.2 release"
+		ewarn
+		ewarn "It is recommended that you migrate any VMs that may be running"
+		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
+		ewarn "any saved states with a newer qemu."
+		ewarn
+		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
+
+		if use x86 || use amd64; then
+			ewarn
+			ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
+			ewarn "installed.  In order to use kvm acceleration, pass the flag"
+			ewarn "-enable-kvm when running your system target."
+		fi
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version sys-firmware/seabios[binary]; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
diff --git a/games-board/ccgo/Manifest b/games-board/ccgo/Manifest
index 12fe9a9e9a0a..a3adc66c1a04 100644
--- a/games-board/ccgo/Manifest
+++ b/games-board/ccgo/Manifest
@@ -1 +1 @@
-DIST ccgo-0.3.6.4.tar.gz 620246 RMD160 066aaa61d172395bc741cd756e390eaa0ab00e77 SHA1 ba2e14cc7f68c2c5f014700f7507643dd7a6edf8 SHA256 1975a4e9b6661f6613dd3a00b3ee7e176b80244f555a184b258b50ef4352a890
+DIST ccgo-0.3.6.4.tar.gz 620246 SHA256 1975a4e9b6661f6613dd3a00b3ee7e176b80244f555a184b258b50ef4352a890 SHA512 54625bbf7036c18f4a9e92df0d7f2d67772138a940c5fdbbffa3d1c2e5c558cad5394d2c556c06388516e53d1f3502cf6369bcd95b1139d4ca5ec4210dcac5c2 WHIRLPOOL dd1b63c6c4360da99f66772373d2b9a0b39b495c57893d89cd69a4db8c0b8c53db059350c906f17a9e1402bacd473827fcce1be4d607c4afa3b1b9eb36de8f9d
diff --git a/games-board/ccgo/ccgo-0.3.6.4.ebuild b/games-board/ccgo/ccgo-0.3.6.4.ebuild
index fc83e9214ebd..25119eadc955 100644
--- a/games-board/ccgo/ccgo-0.3.6.4.ebuild
+++ b/games-board/ccgo/ccgo-0.3.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ccgo/ccgo-0.3.6.4.ebuild,v 1.5 2012/05/04 04:30:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ccgo/ccgo-0.3.6.4.ebuild,v 1.6 2014/09/12 07:31:53 mr_bones_ Exp $
 
-EAPI=2
-inherit autotools games
+EAPI=5
+inherit autotools toolchain-funcs games
 
 DESCRIPTION="An IGS client written in C++"
 HOMEPAGE="http://ccdw.org/~cjj/prog/ccgo/"
@@ -24,26 +24,27 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	sed -i \
 		-e '/^Encoding/d' \
-		-e '/^Categories/s/Application;//' \
-		ccgo.desktop.in \
-		|| die 'sed failed'
+		-e '/^Categories/ { s/Application;//; s/$/GTK;/ }' \
+		ccgo.desktop.in || die
 	sed -i \
 		-e '/^localedir/s/=.*/=@localedir@/' \
 		-e '/^appicondir/s:=.*:=/usr/share/pixmaps:' \
 		-e '/^desktopdir/s:=.*:=/usr/share/applications:' \
-		Makefile.am \
-		|| die 'sed failed'
+		Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
 	egamesconf \
-		--disable-dependency-tracking \
 		--localedir=/usr/share/locale \
 		$(use_enable nls)
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die 'emake install failed'
+	default
 	prepgamesdirs
 }
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
index 0c030e3f4763..be5a70eeec03 100644
--- a/games-board/crafty/Manifest
+++ b/games-board/crafty/Manifest
@@ -1,3 +1,4 @@
 DIST crafty-23.4.zip 426295 SHA256 f49e119b9e843bd1f99b895919b4361ba0d6ae4349e2751a864872d6dd250e66 SHA512 30bc4a5a2b45e945db3d57d0039e8b9c3dae641686c7d3d5292b34d357be7cf819c6d0a94e8a3150f5e5938c9d4490093557ec501f7ec0e58be75927195508be WHIRLPOOL 7e95e108375d9de1419b8dbeb9ceb417c33101018bd765f2be42927bee15941f7eb5b5c91394b1c859201e7f0c14e19d9588b00ac5fe4854f4782577b70ea76e
 DIST crafty-23.8.zip 429967 SHA256 01c3c34125e43dcdba9015d8b31f0e2c46a58d792e8eefc0b75ca3ec6b294e14 SHA512 9566fd838c73fedfc251e8c6740e626d107a89e27371fb568578e280e74ca0c61c4ed34f9c42ddf3558296684fdb2e54bc13a05287223061fc41d958faf03d90 WHIRLPOOL c8e31fa9d8a9b52afca18cf353879a85a5d50d0a778931a3399f6354b7ee0d94e67d3dcb7e480fda10094cb5dfc2f92ae62ef2d8c103316fea47c19b8c885ad7
+DIST crafty-24.0.zip 434880 SHA256 9c6372900574614fb36f82fd141357123be879225de0868e9b3be0fd16395cf4 SHA512 228d715f57cfe32a48ac4391adf66c256e3879523ca71861e5cc59c0a77125534848a894cf9f923f3406696d587b3f1a9ee815998c6dd188829cfccbe2e5290f WHIRLPOOL ee75c6a73bc89d8fe8be2e94d1d0e28013fa590e0ada57a19e0e79c329f91d6f90973d3aa08c4fb10ad015358695f106d7a95b8a4893920fc6c99b07517f0bb0
 DIST crafty.doc.ascii 79678 SHA256 be291c0f4c7e7d64404ec58b9e92c2455c4342d3c96c721ba21a80fce8332e83 SHA512 562698c3954e53f05c009025291bdb748baaa08616437796a08b42198057cff9f9efa7a8caf41574e71dafe60f4c132dc9497ad5ed9a83b8f071d1c31c8583b8 WHIRLPOOL 8786cafa5afd98b6878467701ff19206f220b20fd3f575f51f17a052de709d7f5572632dd56876d34a412d4628a6c4eb984ec6e6f148a3418ff16617d7670845
diff --git a/games-board/crafty/crafty-24.0.ebuild b/games-board/crafty/crafty-24.0.ebuild
new file mode 100644
index 000000000000..cf95aac0a281
--- /dev/null
+++ b/games-board/crafty/crafty-24.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-24.0.ebuild,v 1.1 2014/09/12 08:03:30 mr_bones_ Exp $
+
+EAPI=5
+inherit flag-o-matic toolchain-funcs eutils games
+
+DESCRIPTION="Bob Hyatt's strong chess engine"
+HOMEPAGE="http://www.craftychess.com/"
+SRC_URI="http://www.craftychess.com/${P}.zip
+	http://www.cis.uab.edu/hyatt/crafty/source/${P}.zip
+	ftp://ftp.cis.uab.edu/pub/hyatt/documentation/${PN}.doc.ascii"
+
+LICENSE="crafty"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="no-opts"
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	sed -i \
+		-e '/-o crafty/s/CC/CXX/' \
+		-e 's:CXFLAGS:CXXFLAGS:g' \
+		Makefile || die
+	sed -i \
+		-e "s:\"crafty.hlp\":\"${GAMES_DATADIR}/${PN}/crafty.hlp\":" option.c || die
+}
+
+src_compile() {
+	local makeopts="target=UNIX"
+
+	if ! use no-opts ; then
+		if [[ $(tc-getCC) = icc ]] ; then
+			makeopts="${makeopts} asm=X86.o"
+			append-flags -D_REENTRANT -tpp6 \
+				-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
+				-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST \
+				-DSMP -DCPUS=4 -DCLONE -DDGT
+			append-flags -O2 -fno-alias -fforce-mem \
+				-fomit-frame-pointer -fno-gcse -mpreferred-stack-boundary=2
+		else
+			if [[ "${CHOST}" == "i686-pc-linux-gnu" ]] \
+			|| [[ "${CHOST}" == "i586-pc-linux-gnu" ]] ; then
+				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
+					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
+					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
+				append-flags -fno-gcse \
+					-fomit-frame-pointer -mpreferred-stack-boundary=2
+			elif [[ "${CHOST}" == "x86_64-pc-linux-gnu" ]] ; then
+				append-flags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
+					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
+					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
+				append-flags -fomit-frame-pointer
+			else
+				: # everything else :)
+			fi
+		fi
+	fi
+	append-flags -DPOSIX -DSKILL
+	emake ${makeopts} crafty-make LDFLAGS="${LDFLAGS} -pthread"
+}
+
+src_install() {
+	dogamesbin crafty
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins crafty.hlp
+	dodoc "${DISTDIR}"/crafty.doc.ascii
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog
+	elog "Note: No books or tablebases have been installed. If you want them, just"
+	elog "      download them from ${HOMEPAGE}."
+	elog "      You will find documentation there too. In most cases you take now "
+	elog "      your xboard compatible application, (xboard, eboard, knights) and "
+	elog "      just play chess against computer opponent. Have fun."
+	elog
+}
diff --git a/games-board/pouetchess/Manifest b/games-board/pouetchess/Manifest
index abd4838e466c..50b4d832e6ac 100644
--- a/games-board/pouetchess/Manifest
+++ b/games-board/pouetchess/Manifest
@@ -1 +1 @@
-DIST pouetchess_src_0.2.0.tar.gz 1055338 SHA256 fe966ff1b0aa2dd6d0ca2b62692f5b788e3a286050a6a374e58ca0612f68b2ef
+DIST pouetchess_src_0.2.0.tar.gz 1055338 SHA256 fe966ff1b0aa2dd6d0ca2b62692f5b788e3a286050a6a374e58ca0612f68b2ef SHA512 20d9b2edc3e3998716eddd38b82226f5c1298b9bf5cabc56a545bee602ce3e7a9106f130265f2b0d31ee56d728da2cc54a79623faa6841732cde0d7d94c33acf WHIRLPOOL d18b69de08fc4b45adbe924e2f859cd8bb9e84f23c02a60c214f3f9823d02152c7c5d073ed85574267558968ce03721485c195bdbe41ccb890f5e3efa438cd5c
diff --git a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
index a2c6d492d74b..2ab7e4c3927f 100644
--- a/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
+++ b/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild,v 1.13 2013/06/29 16:09:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pouetchess/pouetchess-0.2.0-r1.ebuild,v 1.14 2014/09/12 07:56:16 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils scons-utils games
 
 MY_PN=${PN/c/C}
@@ -15,25 +15,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug"
 
-DEPEND="media-libs/libsdl:0
+DEPEND="media-libs/libsdl:0[opengl,video]
 	media-libs/sdl-image[jpeg,png]
 	virtual/glu
 	virtual/opengl"
+RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${PN}_src_${PV}
 
-PATCHES=( "${FILESDIR}/${P}-sconstruct-sandbox.patch"
-	"${FILESDIR}/${P}-nvidia_glext.patch"
-	"${FILESDIR}/${P}-segfaults.patch"
-	"${FILESDIR}/${P}-gcc43.patch" )
-
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	epatch \
+		"${FILESDIR}/${P}-sconstruct-sandbox.patch" \
+		"${FILESDIR}/${P}-nvidia_glext.patch" \
+		"${FILESDIR}/${P}-segfaults.patch" \
+		"${FILESDIR}/${P}-gcc43.patch"
 	# Fix for LibSDL >= 1.2.10 detection
 	sed -i \
 		-e "s:sdlver.split('.') >= \['1','2','8'\]:sdlver.split('.') >= [1,2,8]:" \
-		pouetChess.py \
-		|| die
+		pouetChess.py || die
 }
 
 src_configure() {
@@ -43,19 +42,18 @@ src_configure() {
 		optimize=false \
 		prefix="${GAMES_PREFIX}" \
 		datadir="${GAMES_DATADIR}"/${PN} \
-		$(use debug && echo debug=1) \
-		|| die
+		$(use debug && echo debug=1) || die
 }
 
 src_compile() {
-	escons || die
+	escons
 }
 
 src_install() {
-	dogamesbin bin/${MY_PN} || die
+	dogamesbin bin/${MY_PN}
 
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data/* || die
+	doins -r data/*
 
 	dodoc ChangeLog README
 
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index fb6eddb4ba42..1f0de42eb703 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,3 +1 @@
-DIST x265-0.8.tar.bz2 542439 SHA256 279985c47034dda4b3b9fef114aba3c8e8a3d1b26d59cc54ec7d52d13e086835 SHA512 78f7cd0aa6482d6ae921bf7cabc580cd9784a75920eb211a9cbe17fce2168fefe466e6ce1b21b8e7f4fd3ab51d80f33388bf6ec68e0203714294591d0c08b43c WHIRLPOOL 82136477653809fd39a9ad9e2db54bfe972e4eebf451295fd086e6c311d3ed6ef3db4b85c83d5620207035c43ad113ab0e6482357d448685e05950452b804564
-DIST x265-1.0.tar.bz2 564321 SHA256 38b5a8e30eb4e7f7968ca33366a6539b8a7cfdd5aec36ad502ad6eb5c9c35aa8 SHA512 885389a4b039d7c75e28698109c3e2b4b7a83aec5b177940d91ad05a2061bf02233ac4efa01d42a7835df5d7fae6496d80c7baed51f02a40b9bd987a20c95539 WHIRLPOOL a8d1bc1c6b7ba51022a4c7d3507ff640e752d03a1a33b00ce7097d23e8ea4d92aec9005d638280045032929eb9e0129525d27bb8ec29301dda73272546e74694
-DIST x265-1.2.tar.bz2 573907 SHA256 5f5ae7b9cf73b6ecaa1d169fd9f68f3efad75b0d23f504eeca92d57b3f0cb829 SHA512 60591f5c7bff651b8bae23e14d15ccf2752e1c6edc4547508a8349888d99c9d3f513fe9515acfaaaa8073f6e2f022f6bdc35e5d34516bc75f9fddf3d74018daa WHIRLPOOL a7da95ef7740f96aa66c4490e28b53750c4c666187db6a52666eca3748fa5023da1ad4224f39a1c1d49dfd5259635ce99645351244a7113e6d429aa716c6a12f
+DIST x265-1.3.tar.bz2 562401 SHA256 3807090a99bc351894d58eb037db4f1487b2dba3489eb2c38ab43dd6b7c9b09d SHA512 6743ba5796e032e3b814a2702b88d08c8228da5b0d7cc97f5e38052427f56ba101d63f6076c2438377b72de8d57bb26c350a908920e78faadfe84a14fdafa655 WHIRLPOOL 03114c0f719dfaecc7c970f89ee4eb5cfb46f1f94619bd80f0721ddb32b48f34f1e75ee727168035126edd6355101786b89ae718a786803f26dcca2f102793d8
diff --git a/media-libs/x265/files/x265-libdir.patch b/media-libs/x265/files/x265-libdir.patch
deleted file mode 100644
index 728fad1e9dc5..000000000000
--- a/media-libs/x265/files/x265-libdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: x265-9999/source/CMakeLists.txt
-===================================================================
---- x265-9999.orig/source/CMakeLists.txt
-+++ x265-9999/source/CMakeLists.txt
-@@ -246,8 +246,8 @@ if(NOT MSVC)
- endif()
- install(TARGETS x265-static
-         RUNTIME DESTINATION bin
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib)
-+        LIBRARY DESTINATION lib${LIB_SUFFIX}
-+	ARCHIVE DESTINATION lib${LIB_SUFFIX})
- install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
- 
- if(CMAKE_RC_COMPILER)
-@@ -284,8 +284,8 @@ if(ENABLE_SHARED)
-         set_target_properties(x265-shared PROPERTIES VERSION ${X265_LATEST_TAG} SOVERSION ${X265_BUILD})
-         install(TARGETS x265-shared
-                 RUNTIME DESTINATION bin
--                LIBRARY DESTINATION lib
--                ARCHIVE DESTINATION lib)
-+                LIBRARY DESTINATION lib${LIB_SUFFIX}
-+		ARCHIVE DESTINATION lib${LIB_SUFFIX})
-     endif()
- endif()
- 
-@@ -305,7 +305,7 @@ if(X265_LATEST_TAG)
-     # Produce a pkg-config file
-     configure_file("x265.pc.in" "x265.pc" @ONLY)
-     install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/x265.pc"
--            DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
-+	    DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
- endif()
- 
- if(NOT WIN32)
diff --git a/media-libs/x265/files/x265-libdir_pkgconfig.patch b/media-libs/x265/files/x265-libdir_pkgconfig.patch
deleted file mode 100644
index 4159fbadaa9f..000000000000
--- a/media-libs/x265/files/x265-libdir_pkgconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: x265-9999/source/x265.pc.in
-===================================================================
---- x265-9999.orig/source/x265.pc.in
-+++ x265-9999/source/x265.pc.in
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
- includedir=${prefix}/include
- 
- Name: @CMAKE_PROJECT_NAME@
diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index f62a466f1e7b..e4623460933e 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -6,6 +6,6 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-	  <flag name="10bit">Set output bit depth to 10.</flag>
+	  <flag name="10bit">Set output bit depth to 10</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/x265/x265-0.8.ebuild b/media-libs/x265/x265-0.8.ebuild
deleted file mode 100644
index c4ffd713ccde..000000000000
--- a/media-libs/x265/x265-0.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-0.8.ebuild,v 1.4 2014/07/27 19:01:15 maekke Exp $
-
-EAPI=5
-
-inherit cmake-multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/7"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-libdir.patch"
-	"${FILESDIR}/${PN}-libdir_pkgconfig.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.0.ebuild b/media-libs/x265/x265-1.0.ebuild
deleted file mode 100644
index 04669177c015..000000000000
--- a/media-libs/x265/x265-1.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.0.ebuild,v 1.3 2014/07/27 19:01:15 maekke Exp $
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="http://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/16"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test" || die
-	for i in PoolTest TestBench ; do
-		./${i} || die
-	done
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
diff --git a/media-libs/x265/x265-1.2.ebuild b/media-libs/x265/x265-1.3.ebuild
similarity index 92%
rename from media-libs/x265/x265-1.2.ebuild
rename to media-libs/x265/x265-1.3.ebuild
index 9dd29cf3ec86..20ae72269caf 100644
--- a/media-libs/x265/x265-1.2.ebuild
+++ b/media-libs/x265/x265-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.2.ebuild,v 1.2 2014/07/27 19:01:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-1.3.ebuild,v 1.1 2014/09/12 07:05:00 ssuominen Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/25"
+SLOT="0/31"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 81cdac13705e..1fcc11f1bfff 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.9 2014/07/28 08:03:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x265/x265-9999.ebuild,v 1.10 2014/09/12 07:05:00 ssuominen Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://x265.org/"
 
 LICENSE="GPL-2"
 # subslot = libx265 soname
-SLOT="0/25"
+SLOT="0/31"
 IUSE="+10bit test"
 
 ASM_DEPEND=">=dev-lang/yasm-1.2.0"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f350ee565734..58d81b1a8191 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Sep 2014 07:07:01 +0000
+Fri, 12 Sep 2014 11:36:59 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f350ee565734..58d81b1a8191 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Sep 2014 07:07:01 +0000
+Fri, 12 Sep 2014 11:36:59 +0000
diff --git a/metadata/md5-cache/app-emulation/qemu-2.1.1 b/metadata/md5-cache/app-emulation/qemu-2.1.1
new file mode 100644
index 000000000000..a30345bb26ee
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/qemu-2.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
+DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) infiniband? ( sys-infiniband/librdmacm ) jpeg? ( virtual/jpeg ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) tls? ( net-libs/gnutls ) usb? ( >=dev-libs/libusb-1.0.18 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xfs? ( sys-fs/xfsprogs ) ) !static-user? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.7.5 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.7.5 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) gtk? ( nls? ( sys-devel/gettext ) ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] xattr? ( sys-apps/attr[static-libs(+)] ) >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) infiniband? ( sys-infiniband/librdmacm[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] ) numa? ( sys-process/numactl[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) snappy? ( app-arch/snappy[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) static-user? ( >=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[static-libs(+)] xattr? ( sys-apps/attr[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=5
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs gtk infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_unicore32 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_unicore32 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_7 +filecaps
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) infiniband? ( sys-infiniband/librdmacm ) jpeg? ( virtual/jpeg ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses ) nfs? ( >=net-fs/libnfs-1.9.3 ) numa? ( sys-process/numactl ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) snappy? ( app-arch/snappy ) spice? ( >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) tls? ( net-libs/gnutls ) usb? ( >=dev-libs/libusb-1.0.18 ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xfs? ( sys-fs/xfsprogs ) ) !static-user? ( >=dev-libs/glib-2.0 sys-libs/zlib xattr? ( sys-apps/attr ) ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.7.5 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 pin-upstream-blobs? ( ~sys-firmware/seabios-1.7.5 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) !pin-upstream-blobs? ( sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
+REQUIRED_USE=|| ( qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_unicore32 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_unicore32 qemu_user_targets_x86_64 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_7 ) ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
+SLOT=0
+SRC_URI=http://wiki.qemu-project.org/download/qemu-2.1.1.tar.bz2
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	fcaps	c247b6885e1ff14f794a0eb65fb1e8ec	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	linux-info	2b8c53f6065bdee2d757472215a3088f	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	8257582809714b788173511f975d767d	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	0f1760274637a138b99bb649202ea402	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0aa5d6f64aa34fd1d73e2b3033eeb482
diff --git a/metadata/md5-cache/games-board/ccgo-0.3.6.4 b/metadata/md5-cache/games-board/ccgo-0.3.6.4
index eca52513fc57..8dab3d799f72 100644
--- a/metadata/md5-cache/games-board/ccgo-0.3.6.4
+++ b/metadata/md5-cache/games-board/ccgo-0.3.6.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
 DEPEND=>=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=An IGS client written in C++
-EAPI=2
+EAPI=5
 HOMEPAGE=http://ccdw.org/~cjj/prog/ccgo/
 IUSE=nls
 KEYWORDS=~amd64 ~ppc x86
@@ -10,4 +10,4 @@ RDEPEND=>=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl ) g
 SLOT=0
 SRC_URI=http://ccdw.org/~cjj/prog/ccgo/src/ccgo-0.3.6.4.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=24bc7aec95f433a1d12ecab9fce53ba9
+_md5_=82bdaa3cc89ec7b24be09cf6fc6a667e
diff --git a/metadata/md5-cache/games-board/crafty-24.0 b/metadata/md5-cache/games-board/crafty-24.0
new file mode 100644
index 000000000000..86a1b6de55be
--- /dev/null
+++ b/metadata/md5-cache/games-board/crafty-24.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Bob Hyatt's strong chess engine
+EAPI=5
+HOMEPAGE=http://www.craftychess.com/
+IUSE=no-opts
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=crafty
+RDEPEND=games-misc/games-envd
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.craftychess.com/crafty-24.0.zip http://www.cis.uab.edu/hyatt/crafty/source/crafty-24.0.zip ftp://ftp.cis.uab.edu/pub/hyatt/documentation/crafty.doc.ascii
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	games	e221fed675714bd5545b7488aed9f822	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=b7750ef6c5d9c394be9af8be373a71f7
diff --git a/metadata/md5-cache/games-board/pouetchess-0.2.0-r1 b/metadata/md5-cache/games-board/pouetchess-0.2.0-r1
index f99e64e92d22..22ab79ae1ecb 100644
--- a/metadata/md5-cache/games-board/pouetchess-0.2.0-r1
+++ b/metadata/md5-cache/games-board/pouetchess-0.2.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl:0 media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl dev-util/scons
+DEPEND=media-libs/libsdl:0[opengl,video] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl dev-util/scons
 DESCRIPTION=3D and open source chess game
-EAPI=2
+EAPI=5
 HOMEPAGE=http://pouetchess.sourceforge.net/
 IUSE=debug
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/libsdl:0 media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl games-misc/games-envd
+RDEPEND=media-libs/libsdl:0[opengl,video] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pouetchess/pouetchess_src_0.2.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	06133990e861be0fe60c2b428fd025d9	games	e221fed675714bd5545b7488aed9f822	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	scons-utils	988e24b9e2e4642189b4e97c03e5ae71	toolchain-funcs	0f1760274637a138b99bb649202ea402	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f5655469a3acd2a15ba89ac5e9c75ced
+_md5_=1c4dc13988f08aff2810de7ec9f61e60
diff --git a/metadata/md5-cache/media-libs/x265-0.8 b/metadata/md5-cache/media-libs/x265-0.8
deleted file mode 100644
index 906e423d8cab..000000000000
--- a/metadata/md5-cache/media-libs/x265-0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-SLOT=0/7
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/0.8.tar.bz2 -> x265-0.8.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=8caae46d42a9431d155b1de622c98b55
diff --git a/metadata/md5-cache/media-libs/x265-1.0 b/metadata/md5-cache/media-libs/x265-1.0
deleted file mode 100644
index 2c68f837a4d5..000000000000
--- a/metadata/md5-cache/media-libs/x265-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-SLOT=0/16
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.0.tar.bz2 -> x265-1.0.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=c6b569aab0442d9e0254cecb9ae7903c
diff --git a/metadata/md5-cache/media-libs/x265-1.2 b/metadata/md5-cache/media-libs/x265-1.3
similarity index 88%
rename from metadata/md5-cache/media-libs/x265-1.2
rename to metadata/md5-cache/media-libs/x265-1.3
index ebbb7b02f17c..043568c6b921 100644
--- a/metadata/md5-cache/media-libs/x265-1.2
+++ b/metadata/md5-cache/media-libs/x265-1.3
@@ -6,7 +6,7 @@ HOMEPAGE=http://x265.org/
 IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-SLOT=0/25
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.2.tar.bz2 -> x265-1.2.tar.bz2
+SLOT=0/31
+SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.3.tar.bz2 -> x265-1.3.tar.bz2
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=ccacd883e22a748ac392d313a5720058
+_md5_=6b70286e2f00a1b6dac9664c565923c1
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 538e5d048ceb..fcb967948df3 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -5,6 +5,6 @@ EAPI=5
 HOMEPAGE=http://x265.org/
 IUSE=+10bit test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
-SLOT=0/25
+SLOT=0/31
 _eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	da2974fcb060ec927e93a17c835afa67	eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=a727abef3b24de180bf1739a454a1441
+_md5_=8007cf0c13fa0def0ceaef1be3557be7
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index b5fe0f171798..7ed694cda1e1 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 || ( >=app-shells/
 REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	06133990e861be0fe60c2b428fd025d9	git-r3	6ebae45064cb04482f3c702632dd9528	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	0f1760274637a138b99bb649202ea402
-_md5_=051b9470ba633c7960631d89cf786282
+_md5_=0ef767a5de053d879ccde23f3fc344ce
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 80d624836811..6448d8c2eec4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Sep 2014 07:07:04 +0000
+Fri, 12 Sep 2014 11:37:02 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e81a8cc6e828..e438876c46e4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Sep 12 07:07:01 UTC 2014
+Fri Sep 12 11:36:59 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c4773dc5de92..6099a999ece9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 12 Sep 2014 07:30:01 +0000
+Fri, 12 Sep 2014 12:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f38427507784..19f9a5f2215b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1410505501 Fri 12 Sep 2014 07:05:01 AM UTC UTC
+1410521701 Fri 12 Sep 2014 11:35:01 AM UTC UTC
diff --git a/profiles/package.mask b/profiles/package.mask
index 6f64a6bc475a..c7e0909c3caa 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16027 2014/09/11 14:24:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16028 2014/09/12 09:41:56 maksbotan Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -30,6 +30,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Maxim Koltsov <maksbotan@gentoo.org> (12 Sep 2014)
+# Requires masked libav-10
+# Please DO NOT REMOVE this mask, which was discussed and agreed on #gentoo-dev
+# by mgorny, patrick and others
+=media-video/mpv-0.4*
+=media-video/mpv-0.5*
+
 # Patrick Lauer <patrick@gentoo.org> (11 Sep 2014)
 # Unsatisfiable dependencies after firebird removal
 # Should be treecleaned #522344 #522348
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5bfc24364e2f..8d9aa42df342 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3700,7 +3700,7 @@ media-libs/x264:10bit - Set output bit depth to 10, this may not be compatible w
 media-libs/x264:interlaced - enable interlaced encoding support, this can decrease encoding speed by up to 2%
 media-libs/x264:opencl - Add support for OpenCL.
 media-libs/x264:pic - disable optimized assembly code that is not PIC friendly
-media-libs/x265:10bit - Set output bit depth to 10.
+media-libs/x265:10bit - Set output bit depth to 10
 media-libs/xine-lib:bluray - Enable playback of Blu-ray filesystems using media-libs/libbluray
 media-libs/xine-lib:dxr3 - Enable support for DXR3 mpeg acceleration cards.
 media-libs/xine-lib:flac - Build the media-libs/flac based FLAC demuxer and decoder. This flag is not needed for playing FLAC content, neither standalone nor in Ogg container (OggFLAC), but might have better support for exotic features like 24-bit samples or 96kHz sample rates.
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 3830af9ada37..409a38760c55 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.100 2014/09/11 22:46:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.101 2014/09/12 07:04:31 mgorny Exp $
 
 EAPI=5
 
@@ -74,9 +74,8 @@ prefix_src_archives() {
 	done
 }
 
-EGIT_REPO_URI="https://github.com/mgorny/portage.git"
-EGIT_BRANCH=new-install
-EGIT_MIN_CLONE_TYPE=single
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/portage.git
+	https://github.com/gentoo/portage.git"
 
 python_prepare_all() {
 	distutils-r1_python_prepare_all