Sync with portage [Tue Jul 28 00:35:20 MSK 2015].

9 years ago · c26f0653b1
parent 3e81948040
commit c26f0653b1
97 changed files with 2064 additions and 678 deletions
--- a/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-3214.patch
+++ b/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-3214.patch
@ -0,0 +1,41 @@
+From: Petr Matousek <pmatouse@redhat.com>
+Date: Wed, 17 Jun 2015 10:46:11 +0000 (+0200)
+Subject: i8254: fix out-of-bounds memory access in pit_ioport_read()
+X-Git-Tag: v2.4.0-rc0~43^2~9
+X-Git-Url: http://git.qemu.org/?p=qemu.git;a=commitdiff_plain;h=d4862a87e31a51de9eb260f25c9e99a75efe3235;hp=9dacf32d2cbd66cbcce7944ebdfd6b2df20e33b8
+
+i8254: fix out-of-bounds memory access in pit_ioport_read()
+
+Due converting PIO to the new memory read/write api we no longer provide
+separate I/O region lenghts for read and write operations. As a result,
+reading from PIT Mode/Command register will end with accessing
+pit->channels with invalid index.
+
+Fix this by ignoring read from the Mode/Command register.
+
+This is CVE-2015-3214.
+
+Reported-by: Matt Tait <matttait@google.com>
+Fixes: 0505bcdec8228d8de39ab1a02644e71999e7c052
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Petr Matousek <pmatouse@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+
+diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
+index 3450c98..9b65a33 100644
+--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
+@@ -196,6 +196,12 @@ static uint64_t pit_ioport_read(void *opaque, hwaddr addr,
+     PITChannelState *s;
+ 
+     addr &= 3;
+
+    if (addr == 3) {
+        /* Mode/Command register is write only, read is ignored */
+        return 0;
+    }
+
+     s = &pit->channels[addr];
+     if (s->status_latched) {
+         s->status_latched = 0;
--- a/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-5154-1.patch
+++ b/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-5154-1.patch
@ -0,0 +1,75 @@
+From d2ff85854512574e7209f295e87b0835d5b032c6 Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <kwolf@redhat.com>
+Date: Sun, 26 Jul 2015 23:42:53 -0400
+Subject: [PATCH] ide: Check array bounds before writing to io_buffer
+ (CVE-2015-5154)
+
+If the end_transfer_func of a command is called because enough data has
+been read or written for the current PIO transfer, and it fails to
+correctly call the command completion functions, the DRQ bit in the
+status register and s->end_transfer_func may remain set. This allows the
+guest to access further bytes in s->io_buffer beyond s->data_end, and
+eventually overflowing the io_buffer.
+
+One case where this currently happens is emulation of the ATAPI command
+START STOP UNIT.
+
+This patch fixes the problem by adding explicit array bounds checks
+before accessing the buffer instead of relying on end_transfer_func to
+function correctly.
+
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: John Snow <jsnow@redhat.com>
+---
+ hw/ide/core.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/hw/ide/core.c b/hw/ide/core.c
+index 122e955..44fcc23 100644
+--- a/hw/ide/core.c
+++ b/hw/ide/core.c
+@@ -2021,6 +2021,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val)
+     }
+ 
+     p = s->data_ptr;
+    if (p + 2 > s->data_end) {
+        return;
+    }
+
+     *(uint16_t *)p = le16_to_cpu(val);
+     p += 2;
+     s->data_ptr = p;
+@@ -2042,6 +2046,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr)
+     }
+ 
+     p = s->data_ptr;
+    if (p + 2 > s->data_end) {
+        return 0;
+    }
+
+     ret = cpu_to_le16(*(uint16_t *)p);
+     p += 2;
+     s->data_ptr = p;
+@@ -2063,6 +2071,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val)
+     }
+ 
+     p = s->data_ptr;
+    if (p + 4 > s->data_end) {
+        return;
+    }
+
+     *(uint32_t *)p = le32_to_cpu(val);
+     p += 4;
+     s->data_ptr = p;
+@@ -2084,6 +2096,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr)
+     }
+ 
+     p = s->data_ptr;
+    if (p + 4 > s->data_end) {
+        return 0;
+    }
+
+     ret = cpu_to_le32(*(uint32_t *)p);
+     p += 4;
+     s->data_ptr = p;
--- a/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-5154-2.patch
+++ b/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-5154-2.patch
@ -0,0 +1,26 @@
+From 03441c3a4a42beb25460dd11592539030337d0f8 Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <kwolf@redhat.com>
+Date: Sun, 26 Jul 2015 23:42:53 -0400
+Subject: [PATCH] ide/atapi: Fix START STOP UNIT command completion
+
+The command must be completed on all code paths. START STOP UNIT with
+pwrcnd set should succeed without doing anything.
+
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: John Snow <jsnow@redhat.com>
+---
+ hw/ide/atapi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
+index 950e311..79dd167 100644
+--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
+@@ -983,6 +983,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf)
+ 
+     if (pwrcnd) {
+         /* eject/load only happens for power condition == 0 */
+        ide_atapi_cmd_ok(s);
+         return;
+     }
+ 
--- a/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-5154-3.patch
+++ b/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-5154-3.patch
@ -0,0 +1,69 @@
+From cb72cba83021fa42719e73a5249c12096a4d1cfc Mon Sep 17 00:00:00 2001
+From: Kevin Wolf <kwolf@redhat.com>
+Date: Sun, 26 Jul 2015 23:42:53 -0400
+Subject: [PATCH] ide: Clear DRQ after handling all expected accesses
+
+This is additional hardening against an end_transfer_func that fails to
+clear the DRQ status bit. The bit must be unset as soon as the PIO
+transfer has completed, so it's better to do this in a central place
+instead of duplicating the code in all commands (and forgetting it in
+some).
+
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: John Snow <jsnow@redhat.com>
+---
+ hw/ide/core.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/hw/ide/core.c b/hw/ide/core.c
+index 44fcc23..50449ca 100644
+--- a/hw/ide/core.c
+++ b/hw/ide/core.c
+@@ -2028,8 +2028,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val)
+     *(uint16_t *)p = le16_to_cpu(val);
+     p += 2;
+     s->data_ptr = p;
+-    if (p >= s->data_end)
+    if (p >= s->data_end) {
+        s->status &= ~DRQ_STAT;
+         s->end_transfer_func(s);
+    }
+ }
+ 
+ uint32_t ide_data_readw(void *opaque, uint32_t addr)
+@@ -2053,8 +2055,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr)
+     ret = cpu_to_le16(*(uint16_t *)p);
+     p += 2;
+     s->data_ptr = p;
+-    if (p >= s->data_end)
+    if (p >= s->data_end) {
+        s->status &= ~DRQ_STAT;
+         s->end_transfer_func(s);
+    }
+     return ret;
+ }
+ 
+@@ -2078,8 +2082,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val)
+     *(uint32_t *)p = le32_to_cpu(val);
+     p += 4;
+     s->data_ptr = p;
+-    if (p >= s->data_end)
+    if (p >= s->data_end) {
+        s->status &= ~DRQ_STAT;
+         s->end_transfer_func(s);
+    }
+ }
+ 
+ uint32_t ide_data_readl(void *opaque, uint32_t addr)
+@@ -2103,8 +2109,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr)
+     ret = cpu_to_le32(*(uint32_t *)p);
+     p += 4;
+     s->data_ptr = p;
+-    if (p >= s->data_end)
+    if (p >= s->data_end) {
+        s->status &= ~DRQ_STAT;
+         s->end_transfer_func(s);
+    }
+     return ret;
+ }
+ 
--- a/app-emulation/qemu/qemu-2.3.0-r4.ebuild
+++ b/app-emulation/qemu/qemu-2.3.0-r4.ebuild
@ -0,0 +1,607 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r4.ebuild,v 1.1 2015/07/27 19:32:48 cardoe Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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=""
+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 gtk2 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_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+# Require at least one softmmu or user target.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} )
+	${PYTHON_REQUIRED_USE}
+	gtk2? ( gtk )
+	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 !gtk2 )
+	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:0=[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
+	)"
+CDEPEND="
+	!static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
+	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? (
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( 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] )
+	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="${CDEPEND}
+	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? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+	static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+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}"/${P}-CVE-2015-3456.patch #549404
+	epatch "${FILESDIR}"/${P}-CVE-2015-3209.patch #551752
+	epatch "${FILESDIR}"/${P}-CVE-2015-5158.patch #555680
+	epatch "${FILESDIR}"/${P}-CVE-2015-3214.patch #556052
+	epatch "${FILESDIR}"/${P}-CVE-2015-5154-1.patch #556050 / #555532
+	epatch "${FILESDIR}"/${P}-CVE-2015-5154-2.patch #556050 / #555532
+	epatch "${FILESDIR}"/${P}-CVE-2015-5154-3.patch #556050 / #555532`
+	[[ -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)
+		$(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=$(usex gtk2 2.0 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_setup
+
+	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
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	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)"
+}
--- a/dev-dotnet/zeitgeist-sharp/files/zeitgeist-sharp-0.8.0.0-fix-tools-version.patch
+++ b/dev-dotnet/zeitgeist-sharp/files/zeitgeist-sharp-0.8.0.0-fix-tools-version.patch
@ -0,0 +1,10 @@
+diff -ur a/Zeitgeist/Zeitgeist.csproj b/Zeitgeist/Zeitgeist.csproj
+--- a/Zeitgeist/Zeitgeist.csproj	2011-05-09 16:24:12.000000000 -0500
+++ b/Zeitgeist/Zeitgeist.csproj	2015-02-25 11:13:13.360309437 -0600
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
--- a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
+++ b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0.ebuild,v 1.4 2012/06/28 17:08:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild,v 1.1 2015/07/27 18:33:49 jlec Exp $

-EAPI=4
+EAPI=5

 AUTOTOOLS_AUTORECONF=yes

-inherit autotools-utils mono versionator
+inherit autotools-utils mono-env versionator

 DIR_PV=$(get_version_component_range 1-2)
 DIR_PV2=$(get_version_component_range 1-3)
@ -18,7 +18,7 @@ SRC_URI="
 	doc? ( http://launchpad.net/zeitgeist-sharp/${DIR_PV}/${DIR_PV2}/+download/${PN}-docs-${DIR_PV2}.tar.gz )"

 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE="doc"

@ -35,9 +35,18 @@ AUTOTOOLS_IN_SOURCE_BUILD=1

 PATCHES=(
 	"${FILESDIR}"/${P}-zg-0.9.patch
-	"${FILESDIR}"/${P}-automake-1.12.patch )
+	"${FILESDIR}"/${P}-automake-1.12.patch
+	"${FILESDIR}"/${P}-fix-tools-version.patch
+)
+
+src_prepare() {
+	sed \
+		-e "s:@expanded_libdir@:@libdir@:" \
+		-i Zeitgeist/zeitgeist-sharp.pc.in || die
+	autotools-utils_src_prepare
+}

 src_install() {
+	use doc && HTML_DOCS=( "${WORKDIR}"/${PN}-docs/. )
 	autotools-utils_src_install
-	use doc && dohtml -r "${WORKDIR}"/${PN}-docs/*
 }
--- a/dev-python/Babel/Babel-2.0.ebuild
+++ b/dev-python/Babel/Babel-2.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Babel/Babel-2.0.ebuild,v 1.1 2015/07/27 20:07:38 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ http://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	export BUILD_DIR
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@ -1 +1,2 @@
 DIST Babel-1.3.tar.gz 3401237 SHA256 9f02d0357184de1f093c10012b52e7454a1008be6a5c185ab7a3307aceb1d12e SHA512 3173d578c36d7a20d14ffcf6406ec9fe301e71a199069b3d2e53bd0c66e7f83d6e94f071dc08f2708202ec1ace4d14f4476234cc8347a37b05317302f0cfe0cf WHIRLPOOL fb48c95d0bdd775fa273f24236a05186f64b0e69a53ad99e2c4fa89b306d2d6c0856f72abe506b655baceaabe1fa481719e002c52188f4e01ead0a6f7057db00
+DIST Babel-2.0.tar.gz 3415906 SHA256 44988df191123065af9857eca68e9151526a931c12659ca29904e4f11de7ec1b SHA512 9f12573d97f688baf0d1fc0f61055e34b67964054e70c8a6c286a8b0e42ce58da4d9c8cf54f94e51b47a5256cc4504a14bea497bd626cfad8c860d952e7a5e18 WHIRLPOOL e08b0d2d6192321f653200b9e4e96d898c12ea8176f7e0fb7c2144d3dfb6c4b6c12b85833b05b1a5e2d9ed8cec3712d09c3b0a1822ca9cc7ea4bf1cb24dac3f3
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@ -1,2 +1,3 @@
 DIST astroid-1.3.4.tar.gz 146809 SHA256 0b453eaa4f48aaa25a007ede7165aa424d83d4a14fd3bd636dc9c77f83e8e9bb SHA512 cdb75480402e46e4a18557fcacf320ee79a2b5f37f02a6a0d878ca9406fa598cd9a3eea4b3be16c9d9ff0ac279cf7138b2ebaf71fb256ac52006f09117c3ad30 WHIRLPOOL 909ecefb8ed8fd1ac7b6f543f801d78ea490f15fe2434c58ea6d9b943dd511cc9fc381b72263b81f7e19bfaffad100cfe8014f63fe93f2cff69a51531464269a
 DIST astroid-1.3.6.tar.gz 153863 SHA256 1241ef961448c57b4616beb8dcc959724641dca1e22914663f79d67fec26f854 SHA512 a44a17a59834915798b6c672243dccba57a432f646a2bd377e2b067d79d8057b1db0c22107285abcff19b9719d128a5354f9d5a82f65f628ae8beb15cedcbe35 WHIRLPOOL 3c58c450e54f3756a55075b40973174b0b2f8ba4910aa66bb42f0e85c7d9197d0d5154a2776caeed65a47da2276731d970db73fade3cef74ba583a2a7cffe016
+DIST astroid-1.3.7.tar.gz 154919 SHA256 91018b668d94275b9e55b79804a2a248dac1262c581c51fa880fdf57b5004ec8 SHA512 f2557c10c5a3dc6d52a836db8ab6ac1d945d529d5d6501b093ac87887bb445df0f37a54d72b00cd826ce09378abe7cf283b69892852b7fb2ad5d61dee0996162 WHIRLPOOL 53dca23ca45bd81fbd6957c0588f787c8cb18847a963488bc8c9780ca0c05f21d6605a438ae11b79d34a0cb9790dc7f29db1dfa8009b4ef86b21ac032184c040
--- a/dev-python/astroid/astroid-1.3.7.ebuild
+++ b/dev-python/astroid/astroid-1.3.7.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/astroid/astroid-1.3.7.ebuild,v 1.2 2015/07/27 20:36:24 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="http://bitbucket.org/logilab/astroid http://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	<=dev-python/logilab-common-0.63.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+	)"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RESTRICT="test" # False is not True ;)
+
+# Restrict to test phase, required because suite fails horribly without it
+src_test() {
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	pushd build/lib > /dev/null || die
+	PYTHONPATH=. pytest || die "Tests fail with ${EPYTHON}"
+	popd > /dev/null || die
+}
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@ -1,3 +1,4 @@
 DIST autopep8-1.0.4.tar.gz 121476 SHA256 58883a80d501f6f5d97859f100414c6b6f6131fcfc08bd88364c2ecb37a55153 SHA512 53e902dcdd654b9d67d9a31a2343503b754bec78630a7fd8d229843c53eb27d11c32fd6a4829714ac4d7cbee59b055d12e60453ae4ee01cb6131bf9c5045426f WHIRLPOOL 44748dfce6202e1e82c468862e4505500c939ee88eb474392767e606c537a66736f2788c0b6573db37b7c207f3f4608b2a6ecb0fb231bb8c3c090040d17f0642
 DIST autopep8-1.1.1.tar.gz 123488 SHA256 6cdddca3ba69ecf68efefc00e50def2c6939029af3fab637fd797db76e64d3c0 SHA512 79301c1a6f5696daf29c3ac07d63c83c81b3c750b254ffd1d410dc5bc0711fda0dd7438ee062c60d4b69f5475518e959e963ac623851851955115d6b4a99c429 WHIRLPOOL 51be8fe86afcdd186bd4239b634a1919f671b9da07e9341c23d50fdc773d972753f79fb74e144cb1080dc20230a8e7eab5b9312b05452018e504ad2078176196
 DIST autopep8-1.1.tar.gz 123305 SHA256 bf9e821b927169986dd5bbed20a3144afd7c4ddbb841e01d1deb09fd1121e7fa SHA512 6d82ae0ca0a20af2b5aeb467ec36ff0c1e76b45e72a712702e7002312915533c9c380c978fbd5787889a0b3a194b736b0bd830f1b61e302ecea95c968a7ac370 WHIRLPOOL 562bd3d27f90e7d7410ccd391c7245e87dd20ac165ed1153ccbc1500ccb90a9a83790028970dd74c49850d5870fab2c4c500c37ca06b3fd3f12e842af1f4ec31
+DIST autopep8-1.2.tar.gz 155985 SHA256 dbd7015e55ebaa964fbd7c022fe75a5d280e6652be99aea86634eb4b68424752 SHA512 9f9cacbdc1cec4b4fb968d50600895ea411047a528c2a95c6b0cbfb437332eb4b793b190e591c7f36cb69ae4357294b47e7356384e880bd11c114436c112ec82 WHIRLPOOL 8a82a2f9ff5f932170be196721ec23f2e12a53c5182f0c82b2c71a640b6f86c6ba50c234dd08d2f6eae55dc08a1c29f26fc7ae1e10e50e007b176c2b312be956
--- a/dev-python/autopep8/autopep8-1.2.ebuild
+++ b/dev-python/autopep8/autopep8-1.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-1.2.ebuild,v 1.1 2015/07/27 19:57:26 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (	>=dev-python/pydiff-0.1.2[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Prevent UnicodeDecodeError with LANG=C
+	sed -e "/é/d" -i MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+	# from the travis.yml
+	"${PYTHON}" test/test_autopep8.py || die
+	"${PYTHON}" test/acid.py -aaa --experimental test/example.py || die
+	"${PYTHON}" test/acid.py -aaa --experimental test/example_with_reduce.py || die
+	"${PYTHON}" test/acid.py -aaa --compare-bytecode --experimental test/example.py  die
+	"${PYTHON}" test/acid.py --aggressive --line-range 550 610 test/inspect_example.py || die
+	"${PYTHON}" test/acid.py --line-range 289 925 test/vectors_example.py || die
+	"${PYTHON}" test/test_suite.py || die
+}
+
+pkg_postinst() {
+	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
+	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
+	ewarn "(indentation checks inside triple-quotes)."
+	ewarn "If you do not want to be affected by this, then add the"
+	ewarn "following lines to your local package.mask:"
+	ewarn "  >=dev-python/pep8-1.3"
+	ewarn "  >=dev-python/autopep8-0.6"
+}
--- a/dev-python/flask-socketio/Manifest
+++ b/dev-python/flask-socketio/Manifest
@ -0,0 +1 @@
+DIST flask-socketio-0.6.0.tar.gz 6804 SHA256 5b004bc9a74421ec3983f5167a7cab70853b132a9c9c09d808c07f96bbf6ecd9 SHA512 3093fb659e8fe86a866bf9183401995a6615b3dfc8687549fa5845747935b6cd6bfc7bb56c969489f47fdb1a5420d744817b6a7dce636ab653ef62a08d353b1e WHIRLPOOL 1ff182a51ac24a61e02a6bf46612932bfdb4121737e27c34e324c859e9fe43a6db408fa162d0ff3b3952e8cb9bfa1e9d0f7b9e57149bce8af461fe5f4e829356
--- a/dev-python/flask-socketio/flask-socketio-0.6.0.ebuild
+++ b/dev-python/flask-socketio/flask-socketio-0.6.0.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-socketio/flask-socketio-0.6.0.ebuild,v 1.2 2015/07/27 19:40:39 zmedico Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="Flask-SocketIO"
+DESCRIPTION="Socket.IO integration for Flask applications."
+HOMEPAGE="https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/gevent-socketio-0.3.6[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# pypi tarball does not contain tests
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH="${PWD}" python ./test_socketio.py || die
+}
--- a/dev-python/flask-socketio/metadata.xml
+++ b/dev-python/flask-socketio/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">Flask-SocketIO</remote-id>
+		<remote-id type="github">miguelgrinberg/Flask-SocketIO</remote-id>
+	</upstream>
+	<maintainer>
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@ -1,2 +1,3 @@
 DIST ipaddress-1.0.12.tar.gz 16158 SHA256 8c81980950b6360df6d5451456d09e92895f0a9d4aba96ceabcff66ef1f02b11 SHA512 df17687e7d83a2010ddd969049483d542aefc98641e2519202956edb05d77e23daf29334fedb9c6150139e281875dd8169441d023bbf97055226a0f22a40e8f4 WHIRLPOOL 823710fa6be92764c32e2608fb907314fdef90b047f05703add487a7153b26cb72e6fad98f66b7223b27a800151f14a00889adead5ff0edc54e8107ef8ff3648
+DIST ipaddress-1.0.14.tar.gz 30429 SHA256 226f4be44c6cb64055e23060848266f51f329813baae28b53dc50e93488b3b3e SHA512 fb33b484ca435f4e8817c735a1084f2fa749abca4643a10be644003fdb73cc9205fc28f484ef96d2db90e8b27d8a238d1d7cf20140f7942e39be12c7524e8d6f WHIRLPOOL 30e21d5b7568125575fecd0f8cac4172713c029faa81f88cd2a6111b47da1fb3bea9305a9311ce1a7b2795e9d54b58f2cbef1e5b66f355b8c91633ead0836d04
 DIST ipaddress-1.0.7.tar.gz 15126 SHA256 2c99e9eaea2dacbe4038b3be772ec650f5b4f4c8cc479c3704b81673d96849d7 SHA512 bfbb7ab47c50b1a370dab6905e3212fcd960ecdfa2180605d0775f90f80485040a3760d7042ae503a52d1931e44a0b2dc102de22a107cf2dc4b1e7a441841e8b WHIRLPOOL 00bf3d33e34a3998fdc324a1dc4bbe15149a64c72f7f4b020769097d54e5c46fadd7281639e428b5706855b238738bc74a8655c5009e10626b43979539b59baf
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipaddress/ipaddress-1.0.14.ebuild,v 1.1 2015/07/27 20:34:50 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, a port of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON}" test_ipaddress.py || die
+}
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@ -1,3 +1,3 @@
 DIST mistune-0.5.1.tar.gz 183864 SHA256 cc66489a28845c0e1848ae290af5b555074eb76185136ca058e8eed1faa89692 SHA512 56399def88cc1daf5df02a97aba49c3dcc2f860d53222e524bfbd5f48f262f01344582bfd647c363e631b25c300923f690cd0e68ff4e179c4974166f8beca95f WHIRLPOOL 7fbf46712111c0f3087203e50630e200c4df395cd6593001bc23761f5b07c6151c3199dd44b607058bcfbe726eef244797423497d304e87a1f7ceacff2df4261
-DIST mistune-0.5.tar.gz 184883 SHA256 d53d868cfd10cf757160e88adb5760fce95f7026a243f15a02b7c604238e5869 SHA512 d9c93c0e8972cfa564aa499e64dde115c55c0428d58112697081edc5c5259a772a05e64abf5cfe088f915bafaca9a176a09fa43ccc65a8fff3e7c7a7705e2210 WHIRLPOOL d6f2073780d2d4220f2eebbca4c7252b328394b5a74b14439e09cfa74c7321d66847e6b9d46c1a906630e7b913f74c55548914bcd1626b550b6e364fb259432b
 DIST mistune-0.6.tar.gz 47026 SHA256 d54a69365d01bc97412a39c11674a8aae3f333586e91f38895cc1ad818e13dc5 SHA512 f7f7a7830a733f957c8c541195e061de3ba5843540bc1811639526d7ff0f7b7f549c33af14990bb50e9890eaeb9645cfb9b8cd92e92a4e9a01e388773a33ca16 WHIRLPOOL c52395733faa678655b987a8705f05075ca05922aa5ed5a910d67af35694bdc8a11f7fb8b3fed6398e587dda2208e7e28015756eb5185d372cd3fd3de33610bd
+DIST mistune-0.7.tar.gz 48203 SHA256 1daa2e55f5de63ecde7c446c4677c0447006752f78ad2c9c1c3c3452d395f89f SHA512 0d7450dab279f8dc1a608bccad34ec6a99c54ef26ce2439ffa92e1589b0a505ef11382c5d5db990df0e57ba908e3d4b1198c6416dccaf7f5b798894c898874a3 WHIRLPOOL 51db0cf3ab4990c0ee4b2503e2c1ad2ede225c999d0196a6f24cd4d18a69236d1c9365ffc79f0011b1d2d977aa6a69533a968b2e640bb4c0345234e9e5e5e44c
--- a/dev-python/mistune/mistune-0.5.1.ebuild
+++ b/dev-python/mistune/mistune-0.5.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/mistune-0.5.1.ebuild,v 1.3 2015/07/18 17:09:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/mistune-0.5.1.ebuild,v 1.5 2015/07/27 19:56:23 jlec Exp $

 EAPI=5

--- a/dev-python/mistune/mistune-0.5.ebuild
+++ b/dev-python/mistune/mistune-0.5.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/mistune-0.5.ebuild,v 1.2 2015/07/18 17:09:23 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/cython[$(python_gen_usedep 'python*')]
-"
-
-python_test() {
-	${EPYTHON} tests/test.py || die
-}
--- a/dev-python/mistune/mistune-0.7.ebuild
+++ b/dev-python/mistune/mistune-0.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/mistune-0.6.ebuild,v 1.2 2015/07/18 17:09:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mistune/mistune-0.7.ebuild,v 1.1 2015/07/27 19:00:56 jlec Exp $

 EAPI=5

--- a/dev-python/socketio-client/Manifest
+++ b/dev-python/socketio-client/Manifest
@ -0,0 +1 @@
+DIST socketio-client-0.5.6.tar.gz 12069 SHA256 540d8ab209154d1d9cdb97c170c589a14f7d7f17e19c14e2f59f0307e6175485 SHA512 2ab316823cce0201b0c3a55b04a04fa39fe97f990b879fd5b45ccf6fa2ee6412d8c08d9892120f9a98fcf438e7e6302cf319a4df6cda061b90e1d802580563b9 WHIRLPOOL 6ba7f776ab0af9ae5efb0aca3d908daa018a83dd69e0a490efcd03c912c1c402d5c9a1381804df8cce333566182c76b321c4dd6bf14c948ede984aa752152dab
--- a/dev-python/socketio-client/metadata.xml
+++ b/dev-python/socketio-client/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">socketIO-client</remote-id>
+		<remote-id type="github">invisibleroads/socketIO-client</remote-id>
+	</upstream>
+	<maintainer>
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/socketio-client/socketio-client-0.5.6.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.5.6.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/socketio-client/socketio-client-0.5.6.ebuild,v 1.1 2015/07/27 19:55:21 zmedico Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_{3,4}} )
+
+inherit distutils-r1
+
+MY_PN="socketIO-client"
+DESCRIPTION="A socket.io client library for Python"
+HOMEPAGE="https://github.com/invisibleroads/${MY_PN}/ https://pypi.python.org/pypi/${MY_PN}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RESTRICT="test"
+
+python_test() {
+	PYTHONPATH="${PWD}" python -m unittest
+}
--- a/eclass/golang-base.eclass
+++ b/eclass/golang-base.eclass
@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-base.eclass,v 1.1 2015/07/27 19:11:00 williamh Exp $
+
+# @ECLASS: golang-build.eclass
+# @MAINTAINER:
+# William Hubbs <williamh@gentoo.org>
+# @BLURB: Eclass that provides base functions for Go packages.
+# @DESCRIPTION:
+# This eclass provides base functions for software written in the Go
+# programming language; it also provides the build-time dependency on
+# dev-lang/go.
+
+case "${EAPI:-0}" in
+	5)
+		;;
+	*)
+		die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
+		;;
+esac
+
+if [[ -z ${_GOLANG_BASE} ]]; then
+
+_GOLANG_BASE=1
+
+DEPEND=">=dev-lang/go-1.4.2:="
+STRIP_MASK="*.a"
+
+# @ECLASS-VARIABLE: EGO_PN
+# @REQUIRED
+# @DESCRIPTION:
+# This is the import path for the go package to build. Please emerge
+# dev-lang/go and read "go help importpath" for syntax.
+#
+# Example:
+# @CODE
+# EGO_PN=github.com/user/package
+# @CODE
+
+# @FUNCTION: ego_pn_check
+# @DESCRIPTION:
+# Make sure EGO_PN has a value.
+ego_pn_check() {
+	[[ -z "${EGO_PN}" ]] &&
+		die "${ECLASS}.eclass: EGO_PN is not set"
+	return 0
+}
+
+# @FUNCTION: get_golibdir
+# @DESCRIPTION:
+# Return the non-prefixed library directory where Go packages
+# should be installed
+get_golibdir() {
+	echo /usr/lib/go-gentoo
+}
+
+# @FUNCTION: get_golibdir_gopath
+# @DESCRIPTION:
+# Return the library directory where Go packages should be installed
+# This is the prefixed version which should be included in GOPATH
+get_golibdir_gopath() {
+	echo "${EPREFIX}$(get_golibdir)"
+}
+
+# @FUNCTION: golang_install_pkgs
+# @DESCRIPTION:
+# Install Go packages.
+# This function assumes that $cwd is a Go workspace.
+golang_install_pkgs() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	ego_pn_check
+	insinto "$(get_golibdir)"
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	doins -r pkg src
+}
+
+fi
--- a/eclass/golang-build.eclass
+++ b/eclass/golang-build.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.5 2015/07/23 15:42:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.6 2015/07/27 19:11:00 williamh Exp $

 # @ECLASS: golang-build.eclass
 # @MAINTAINER:
@ -10,6 +10,8 @@
 # This eclass provides default  src_compile, src_test and src_install
 # functions for software written in the Go programming language.

+inherit golang-base
+
 case "${EAPI:-0}" in
 	5)
 		;;
@ -24,9 +26,6 @@ if [[ -z ${_GOLANG_BUILD} ]]; then

 _GOLANG_BUILD=1

-DEPEND=">=dev-lang/go-1.4.2:="
-STRIP_MASK="*.a"
-
 # @ECLASS-VARIABLE: EGO_PN
 # @REQUIRED
 # @DESCRIPTION:
@ -38,49 +37,10 @@ STRIP_MASK="*.a"
 # EGO_PN=github.com/user/package
 # @CODE

-# @FUNCTION: _golang-build_setup
-# @INTERNAL
-# @DESCRIPTION:
-# Make sure EGO_PN has a value.
-_golang-build_setup() {
-	[[ -z "${EGO_PN}" ]] &&
-		die "${ECLASS}.eclass: EGO_PN is not set"
-	return 0
-}
-
-# @FUNCTION: get_golibdir
-# @DESCRIPTION:
-# Return the non-prefixed library directory where Go packages
-# should be installed
-get_golibdir() {
-	echo /usr/lib/go-gentoo
-}
-
-# @FUNCTION: get_golibdir
-# @DESCRIPTION:
-# Return the library directory where Go packages should be installed
-# This is the prefixed version which should be included in GOPATH
-get_golibdir_gopath() {
-	echo "${EPREFIX}$(get_golibdir)"
-}
-
-# @FUNCTION: golang_install_pkgs
-# @DESCRIPTION:
-# Install Go packages.
-# This function assumes that $cwd is a Go workspace.
-golang_install_pkgs() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	_golang-build_setup
-	insinto "$(get_golibdir)"
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r pkg src
-}
-
 golang-build_src_compile() {
 	debug-print-function ${FUNCNAME} "$@"

-	_golang-build_setup
+	ego_pn_check
 	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go build -v -work -x "${EGO_PN}"
 	echo "$@"
@ -90,7 +50,7 @@ golang-build_src_compile() {
 golang-build_src_install() {
 	debug-print-function ${FUNCNAME} "$@"

-	_golang-build_setup
+	ego_pn_check
 	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go install -v -work -x "${EGO_PN}"
 	echo "$@"
@ -101,7 +61,7 @@ golang-build_src_install() {
 golang-build_src_test() {
 	debug-print-function ${FUNCNAME} "$@"

-	_golang-build_setup
+	ego_pn_check
 	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
 		go test -v -work -x "${EGO_PN}"
 	echo "$@"
--- a/eclass/golang-vcs.eclass
+++ b/eclass/golang-vcs.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v 1.3 2015/06/23 18:59:43 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v 1.4 2015/07/27 19:11:00 williamh Exp $

 # @ECLASS: golang-vcs.eclass
 # @MAINTAINER:
@ -10,7 +10,7 @@
 # This eclass is written to ease the maintenance of live ebuilds
 # of software written in the Go programming language.

-inherit eutils
+inherit eutils golang-base

 case "${EAPI:-0}" in
 	5)
@ -26,8 +26,6 @@ if [[ -z ${_GOLANG_VCS} ]]; then

 _GOLANG_VCS=1

-DEPEND=">=dev-lang/go-1.4.2"
-
 # @ECLASS-VARIABLE: EGO_PN
 # @REQUIRED
 # @DESCRIPTION:
@ -114,8 +112,7 @@ _golang-vcs_env_setup() {
 _golang-vcs_fetch() {
 	debug-print-function ${FUNCNAME} "$@"

-	[[ -z ${EGO_PN} ]] &&
-		die "${ECLASS}: EGO_PN is not set"
+	ego_pn_check

 	if [[ -z ${EVCS_OFFLINE} ]]; then
 		[[ -n ${EVCS_UMASK} ]] && eumask_push ${EVCS_UMASK}
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@ -1,2 +1,3 @@
 DIST manaplus-1.3.9.29.tar.xz 7206052 SHA256 adf3bbd3761086d66d1d5cf22369dfadcf5839f382c564bd7d6337ad1e3933c3 SHA512 4ae13254b9ee5d06fc8e2f287fa3cde5076a55bcac0f57398acffc70a5d0b3820d712771def6b8f8ce1ef8f48d1ad8ffc222c8821ec43920aff071a24c4a3a6e WHIRLPOOL db33166b184f9ae018a675b6a3d76b8e296530e02550b9dd6803b3249d8b454a1475a5f8020d976ef3153a68532b86f408f5f3af2ca0f9ea34386db8586abb7c
 DIST manaplus-1.5.6.20.tar.xz 9376348 SHA256 cee7ce82c730c3e2254bc335023eb5531a3bcb4434a926f8685e16a2651f5b7e SHA512 bec1a2f9e0c034f234ce66836454df7296ce366a55d635713f4ba6103b4ab12d5a0dfd5d00b6b67a935499226e50ed1d1750f37ac70f06017d047015ba3a3627 WHIRLPOOL 728621e395fdb6ba4491e35d25897346cd70676a459c729cb56d258aeb6b413e144e57f5f306a7084511f5c0cbe3425ac25b921f3c5367d7db3696e43e869365
+DIST manaplus-1.5.7.18.tar.xz 9374420 SHA256 e59dfc714992308fb9576074d76858fe5375941e7b2b05118cc7599a2695f574 SHA512 aa6e9e0b8e2be81213d995754d9b4b653bf4efb3a2082234c69dd272060b9a9d2de593b4b1281fad80ac9d6b5fa069785ea0b78b9c96215e96984a30bc2cd1d8 WHIRLPOOL 3a1301a594cd46d664ecb7d59e32c4f6977d73ed20814a5285ddb676caf5a20d95a71c3b11b2b4c68a3034b4650c88d83457b92a869e7e0f8fb568efed3a0707
--- a/games-rpg/manaplus/manaplus-1.5.7.18.ebuild
+++ b/games-rpg/manaplus/manaplus-1.5.7.18.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.5.7.18.ebuild,v 1.1 2015/07/27 18:27:41 mr_bones_ Exp $
+
+EAPI=5
+inherit games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl"
+
+RDEPEND="
+	>=dev-games/physfs-1.0.0
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libsdl2[X,opengl?,video]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-net
+	media-libs/sdl2-ttf
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-misc/xdg-utils
+	x11-apps/xmessage
+	media-fonts/dejavu
+	media-fonts/wqy-microhei
+	media-fonts/liberation-fonts
+	media-fonts/mplus-outline-fonts
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e '/^SUBDIRS/s/fonts//' \
+		data/Makefile.in || die
+}
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash \
+	egamesconf \
+		--with-sdl2 \
+		--without-internalsdlgfx \
+		--localedir=/usr/share/locale \
+		--prefix="/usr" \
+		--bindir="${GAMES_BINDIR}" \
+		$(use_with opengl) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
+	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
+
+	prepgamesdirs
+}
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@ -1,2 +1,3 @@
 DIST exaile-0.3.2.0.tar.gz 2082057 SHA256 7571db88db5453d09675ed70d8bd5046825b6e7b79ea76b01707e11cd14609eb
 DIST exaile-0.3.2.1.tar.gz 2061448 SHA256 db3e5b7bb4ad536df31f7f982456ef0aef935021afcd004c8755317584300ff6
+DIST exaile-3.4.5.tar.gz 3662446 SHA256 c875a5c13aa8efb0864d6bafc37e6d3b09f84e251cdb7b77098e6609fb5d00ad SHA512 9337b86ed2f6a13071615bd46a7a05a6564011a4e1fef4cb42925336864c07854cfe497d8defe65c4e287fd9546de6a51543180c5ce6a84525506e57209914be WHIRLPOOL e84c95bab48a9488e2738c16088a3fff333a8af712dd52ac5f0b9d4ce1bdbfc379c2be4fafaf532bb8f44605f1a6ec26cac2e5e96a4a29ba813fdc8b70bbea94
--- a/media-sound/exaile/exaile-3.4.5.ebuild
+++ b/media-sound/exaile/exaile-3.4.5.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/exaile/exaile-3.4.5.ebuild,v 1.1 2015/07/27 19:53:59 polynomial-c Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit fdo-mime multilib python-r1
+
+DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
+HOMEPAGE="http://www.exaile.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cddb libnotify nls"
+
+RDEPEND="dev-python/dbus-python
+	dev-python/gst-python:0.10
+	>=dev-python/pygtk-2.17
+	>=dev-python/pygobject-2.18:2
+	media-libs/gst-plugins-good:0.10
+	>=media-libs/mutagen-1.10
+	media-plugins/gst-plugins-meta:0.10
+	cddb? ( dev-python/cddb-py )
+	libnotify? ( dev-python/notify-python )"
+DEPEND="nls? ( dev-util/intltool
+		sys-devel/gettext )"
+
+RESTRICT="test" #315589
+
+src_compile() {
+	if use nls; then
+		emake locale
+	fi
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	dodoc FUTURE
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
--- a/media-sound/ezstream/Manifest
+++ b/media-sound/ezstream/Manifest
@ -1 +1,2 @@
 DIST ezstream-0.5.6.tar.gz 263150 SHA256 818b7ab2a498ffe6e59155279cb79ed0291c4979210e99af6dda950fe54a30c0
+DIST ezstream-0.6.0.tar.gz 250448 SHA256 f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d WHIRLPOOL 7f9960add62ec83c72fef7db8a7d7836a689879127ba7ad72f0584c152e74d76cef9def4f9251d3101b3e21b344ac8a64e47145969880c5f1fedead8ab80d398
--- a/media-sound/ezstream/ezstream-0.6.0.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ezstream/ezstream-0.6.0.ebuild,v 1.1 2015/07/27 20:13:40 polynomial-c Exp $
+
+EAPI=5
+
+DESCRIPTION="A command line source client for Icecast media streaming servers"
+HOMEPAGE="http://www.icecast.org/ezstream.php"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="taglib"
+
+COMMON_DEPEND="dev-libs/libxml2
+	>=media-libs/libshout-2.2
+	media-libs/libvorbis
+	taglib? ( media-libs/taglib )"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/icecast"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local docdir=/usr/share/doc/${PF}
+
+	econf \
+		--docdir=${docdir} \
+		--enable-examplesdir=${docdir}/examples \
+		$(use_with taglib)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+}
--- a/media-sound/gmtp/Manifest
+++ b/media-sound/gmtp/Manifest
@ -1,4 +1,2 @@
-DIST gmtp-1.3.1-i386.tar.gz 904085 SHA256 b1109576fccf2ba6680d7e0575fea6e767edca23cb8d7c4d2d96c0cba7405e93 SHA512 ae20dfb005d0717c255c69ef69a9589f126c5d3c584f4a1c568eb3a45f718a9bb13739a8c53ee7befb2274d82dbcd10b170bb99849e738c6410757074a7a98df WHIRLPOOL 80b6efa5abf0946a3844f179964b46a69ff0c693de184a9ad0c8bee2446417cd702ffb1df470f29f478aefae24264a233e98b69e25c76ddcaf71c974d5f84a7f
-DIST gmtp-1.3.3-i386.tar.gz 905237 SHA256 b6c1671b00e06175503ba3ba1962407eb18888e693e35dcb5f7dd5c8ffc468d1 SHA512 675d1ad5146225443ef0a7e654d70b761ef665d2eb9ee88ed1667e3599acf2c99384d48f0bf3ddc3dd5be1c5d2f2768c5f14c7fb1b1b9ffedf36045423660867 WHIRLPOOL ce5edd01b731450f440db4abb773d192c086ab576071284fd2a3fe36dbfc65edf1a5a1fdf3e9c4812ed1c5d84374ab17663cc2beaaaa0c03492861a98b10902a
-DIST gmtp-1.3.4-i386.tar.gz 878661 SHA256 9bf99c517bb40b8df288243e2b77aebb2c3d62b2baf98f9aa8675d6cf910be41 SHA512 54c0de87867ab8fc284492db97c05fec47bf2c5ff9c2ae1d6218ce2a710f68139e47d3a0efcbdc789351db5627435c66df0f66621330b7c30e5b09f1ad59a96a WHIRLPOOL da5e89b16b41185f4f1f7f397394ee840af35491e17f7a90bf86c130533df2689a0da89c3c8aec1473e899987c92f0029233a48f1d6df79525300a24946efe71
 DIST gmtp-1.3.5.tar.gz 1613492 SHA256 ae6950d7157e6b90a46f0f850085c5e2fba628e9e58ba493ba164eb3405f55d3 SHA512 5e6f4b4f5dff0d9d5a2b477a8b174958d660bca046b8904b019540b9fc975be974e3dd261c4ee00ea00a023227a9f641911b46bb94dd7b00ff5354bbb5bdae6a WHIRLPOOL 2fa7747418d1e8a7ba0d8bb661d100e8e9953ec938d4af7e70c82d6dd94c0c714403d5e0cfa3d0b956aa8f940d7991d24e30e99bdafe5b6ff7238425fe0e792b
+DIST gmtp-1.3.9.tar.gz 489612 SHA256 5bff5385db66f5c3e82d89edb7ca4a8ccb8c8954faf7341438080f2741dcbd2d SHA512 e5fc652105d23719cb366bb9292c1520cc0a0e4c10179fec6108145c32725ea2a8e47b10c0bee415327718b3d9e2c2f84e0fda6225e57b472d9eabe4fcb615e0 WHIRLPOOL ca95a0b1a194a6c40bd20916614a75b77f6bf525179fb81bdb8c4788edc0127b0552427e82e335d119907864822f58917be6c07463225f5a17a0ce7c0b001ae0
--- a/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch
+++ b/media-sound/gmtp/files/gmtp-1.3.1-pkg-config.patch
@ -1,29 +0,0 @@
-https://sourceforge.net/p/gmtp/discussion/requests/thread/ce4152cc/
-
-respect $(PKG_CONFIG), and add missing gthread-2.0
-
--- a/Makefile
-+++ b/Makefile
-@@ -42,14 +42,18 @@ LIBS +=
- 
- .SUFFIXES: .c .o .po .mo
- 
-GTK_CFLAGS = `pkg-config --cflags gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile`
-GTK_LDFLAGS = `pkg-config --libs gtk+-2.0 gconf-2.0 libmtp id3tag flac vorbisfile`
-+PKG_CONFIG ?= pkg-config
- 
- ifeq ($(MAKECMDGOALS),gtk3)
-GTK_CFLAGS = `pkg-config --cflags gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile`
-GTK_LDFLAGS = `pkg-config --libs gtk+-3.0 gio-2.0 libmtp id3tag flac vorbisfile`
-+PKGS = gtk+-3.0 gio-2.0
- CFLAGS += -DGMTP_USE_GTK3
-+else
-+PKGS = gtk+-2.0 gconf-2.0
- endif
-+PKGS += gthread-2.0 libmtp id3tag flac vorbisfile
-+
-+GTK_CFLAGS = `$(PKG_CONFIG) --cflags $(PKGS)`
-+GTK_LDFLAGS = `$(PKG_CONFIG) --libs $(PKGS)`
- 
- objects = src/main.o src/mtp.o src/interface.o src/callbacks.o src/prefs.o src/dnd.o src/metatag_info.o
- headers = src/main.h src/mtp.h src/interface.h src/callbacks.h src/prefs.h src/dnd.h src/metatag_info.h src/config.h
--- a/media-sound/gmtp/gmtp-1.3.1-r300.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.1-r300.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.1-r300.ebuild,v 1.2 2012/06/01 18:11:19 vapier Exp $
-
-EAPI=4
-inherit gnome2-utils toolchain-funcs eutils
-
-DESCRIPTION="A simple MTP client for MP3 players"
-HOMEPAGE="http://gmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-i386.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	media-libs/flac
-	media-libs/libid3tag
-	>=media-libs/libmtp-1.1.0
-	media-libs/libvorbis
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gMTP
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pkg-config.patch
-	sed -i \
-		-e '/CFLAGS/s:-g::' \
-		-e '/glib-compile-schemas/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake gtk3 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install-gtk3 register-gsettings-schemas
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
--- a/media-sound/gmtp/gmtp-1.3.3.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.3.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.3.ebuild,v 1.2 2012/06/22 05:49:44 ssuominen Exp $
-
-EAPI=4
-inherit gnome2-utils toolchain-funcs
-
-DESCRIPTION="A simple MTP client for MP3 players"
-HOMEPAGE="http://gmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-i386.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	media-libs/flac
-	media-libs/libid3tag
-	media-libs/libmtp
-	media-libs/libvorbis
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gMTP
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS/s:-g::' \
-		-e '/glib-compile-schemas/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake gtk3 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install-gtk3 register-gsettings-schemas
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
--- a/media-sound/gmtp/gmtp-1.3.9.ebuild
+++ b/media-sound/gmtp/gmtp-1.3.9.ebuild
@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.4.ebuild,v 1.1 2012/11/15 00:21:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmtp/gmtp-1.3.9.ebuild,v 1.1 2015/07/27 20:55:08 polynomial-c Exp $

-EAPI=4
-inherit gnome2-utils toolchain-funcs
+EAPI=5
+inherit gnome2-utils

 DESCRIPTION="A simple MTP client for MP3 players"
 HOMEPAGE="http://gmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-i386.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
@ -24,22 +24,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"

-S=${WORKDIR}/gMTP
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS/s:-g::' \
-		-e '/glib-compile-schemas/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake gtk3 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install-gtk3 register-gsettings-schemas
-	dodoc AUTHORS ChangeLog README
+src_configure() {
+	econf --with-gtk3
 }

 pkg_preinst() {
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 27 Jul 2015 17:11:05 +0000
+Mon, 27 Jul 2015 21:06:52 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 27 Jul 2015 17:11:05 +0000
+Mon, 27 Jul 2015 21:06:52 +0000
--- a/metadata/md5-cache/app-emulation/lxd-0.13
+++ b/metadata/md5-cache/app-emulation/lxd-0.13
@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=app-admin/cgmanager app-arch/xz-utils app-emulation/lxc[cgmanager] net-analyzer/openbsd-netcat net-misc/bridge-utils virtual/acl image? ( app-crypt/gnupg >=dev-lang/python-3.2 )
 SLOT=0
 SRC_URI=http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/lxd-0.13.tar.bz2
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=c8295b120329f133bb04928ee8181a08
--- a/metadata/md5-cache/app-emulation/qemu-2.3.0-r4
+++ b/metadata/md5-cache/app-emulation/qemu-2.3.0-r4
--- a/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r2
+++ b/metadata/md5-cache/dev-dotnet/zeitgeist-sharp-0.8.0.0-r2
@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Mono DBus API wrapper for Zeitgeist
-EAPI=4
+EAPI=5
 HOMEPAGE=https://launchpad.net/zeitgeist-sharp/
 IUSE=doc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib dev-dotnet/glib-sharp dev-lang/mono gnome-extra/zeitgeist
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-0.8.0.0.tar.gz doc? ( http://launchpad.net/zeitgeist-sharp/0.8/0.8.0/+download/zeitgeist-sharp-docs-0.8.0.tar.gz )
-_eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e26204d85c8a671c037e4e85dde0503f
+_eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2dac49f0940aa6345510e762a086c356
--- a/metadata/md5-cache/dev-go/go-crypto-9999
+++ b/metadata/md5-cache/dev-go/go-crypto-9999
@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
+DEPEND=>=dev-lang/go-1.4.2:=
 DESCRIPTION=Go supplementary cryptography libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/crypto
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	golang-vcs	616e88d5c2fef1e6db0ea78912c863bf	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=58c555bfab43a932bda15d06cd793202
--- a/metadata/md5-cache/dev-go/go-net-9999
+++ b/metadata/md5-cache/dev-go/go-net-9999
@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-text:= >=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
+DEPEND=dev-go/go-text:= >=dev-lang/go-1.4.2:=
 DESCRIPTION=Go supplementary network libraries
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/net
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	golang-vcs	616e88d5c2fef1e6db0ea78912c863bf	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7175610bcde4e0493b9b793285cf01ae
--- a/metadata/md5-cache/dev-go/go-oauth2-9999
+++ b/metadata/md5-cache/dev-go/go-oauth2-9999
@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.4.2:=
 DESCRIPTION=Go client implementation for OAuth 2.0 spec
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/oauth2
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	golang-vcs	616e88d5c2fef1e6db0ea78912c863bf	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d0a2f16b058164c4294d6dc4d915b957
--- a/metadata/md5-cache/dev-go/go-sys-9999
+++ b/metadata/md5-cache/dev-go/go-sys-9999
@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
+DEPEND=>=dev-lang/go-1.4.2:=
 DESCRIPTION=Go packages for low-level interaction with the operating system
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/sys
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	golang-vcs	616e88d5c2fef1e6db0ea78912c863bf	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0d23784d47ca48dd12ef7a4831f9b685
--- a/metadata/md5-cache/dev-go/go-text-9999
+++ b/metadata/md5-cache/dev-go/go-text-9999
@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
+DEPEND=>=dev-lang/go-1.4.2:=
 DESCRIPTION=Go text processing support
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/text
 LICENSE=BSD
 SLOT=0/9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	golang-vcs	616e88d5c2fef1e6db0ea78912c863bf	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d8629d06630cfb930d22cf87752f8a74
--- a/metadata/md5-cache/dev-go/go-tools-9999
+++ b/metadata/md5-cache/dev-go/go-tools-9999
@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-go/go-net:= >=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
+DEPEND=dev-go/go-net:= >=dev-lang/go-1.4.2:=
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	22cdd0410f0c4854cbb250de691997bd	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-base	b27bb70124fa06118fd307e9f8df50b9	golang-build	347dcb77455fa2a3c30668a127d9b4dc	golang-vcs	616e88d5c2fef1e6db0ea78912c863bf	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fe5463d0dd64c914552769089e348a7a
--- a/metadata/md5-cache/dev-python/Babel-2.0
+++ b/metadata/md5-cache/dev-python/Babel-2.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) test? ( >=dev-python/pytest-2.3.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=A collection of tools for internationalizing Python applications
+EAPI=5
+HOMEPAGE=http://babel.edgewall.org/ http://pypi.python.org/pypi/Babel
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=mirror://pypi/B/Babel/Babel-2.0.tar.gz
+_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=e04f74b23e4fbd2a684eb852f51c3635
--- a/metadata/md5-cache/dev-python/astroid-1.3.7
+++ b/metadata/md5-cache/dev-python/astroid-1.3.7
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] test? ( <=dev-python/logilab-common-0.63.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=dev-python/pylint-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/egenix-mx-base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Abstract Syntax Tree for logilab packages
+EAPI=5
+HOMEPAGE=http://bitbucket.org/logilab/astroid http://pypi.python.org/pypi/astroid
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=<=dev-python/logilab-common-0.63.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/astroid/astroid-1.3.7.tar.gz
+_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=cbd6735445698472fbffdfcb9db00e50
--- a/metadata/md5-cache/dev-python/autopep8-1.2
+++ b/metadata/md5-cache/dev-python/autopep8-1.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=test? ( >=dev-python/pydiff-0.1.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=5
+HOMEPAGE=https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pep8-1.5.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
+SLOT=0
+SRC_URI=https://github.com/hhatto/autopep8/tarball/ver1.2 -> autopep8-1.2.tar.gz
+_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=116a28c820bb1c76d772a595d5e04cd7
--- a/metadata/md5-cache/dev-python/flask-socketio-0.6.0
+++ b/metadata/md5-cache/dev-python/flask-socketio-0.6.0
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/flask-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-socketio-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Socket.IO integration for Flask applications.
+EAPI=5
+HOMEPAGE=https://flask-socketio.readthedocs.org/ https://github.com/miguelgrinberg/Flask-SocketIO/ https://pypi.python.org/pypi/Flask-SocketIO
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/flask-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gevent-socketio-0.3.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-SocketIO/Flask-SocketIO-0.6.0.tar.gz -> flask-socketio-0.6.0.tar.gz
+_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=51276cf1df2675024e259d650aff115f
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.14
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.14
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
-DESCRIPTION=The fastest markdown parser in pure Python
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
+DESCRIPTION=IPv4/IPv6 manipulation library, a port of the ipaddress module
 EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/mistune https://github.com/lepture/mistune
+HOMEPAGE=https://github.com/phihag/ipaddress
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=PSF-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
-SRC_URI=mirror://pypi/m/mistune/mistune-0.5.tar.gz
+SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.14.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7d6f624399af195ab0c37e74580a374c
+_md5_=47eaa898567254f802cfff02c3fa308e
--- a/metadata/md5-cache/dev-python/mistune-0.5.1
+++ b/metadata/md5-cache/dev-python/mistune-0.5.1
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.5.1.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8ac7ae6e6ec9ee33504fc0ef23ef8437
+_md5_=8e3803f51e782cf14a90232d2761bcfe
--- a/metadata/md5-cache/dev-python/mistune-0.7
+++ b/metadata/md5-cache/dev-python/mistune-0.7
@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
 SLOT=0
-SRC_URI=mirror://pypi/m/mistune/mistune-0.6.tar.gz
+SRC_URI=mirror://pypi/m/mistune/mistune-0.7.tar.gz
 _eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=cbf68de6a94bce8c0f3bf179e5b1a45a
+_md5_=91b60aff39bf0c2ef686da1d875b2ad0
--- a/metadata/md5-cache/dev-python/socketio-client-0.5.6
+++ b/metadata/md5-cache/dev-python/socketio-client-0.5.6
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A socket.io client library for Python
+EAPI=5
+HOMEPAGE=https://github.com/invisibleroads/socketIO-client/ https://pypi.python.org/pypi/socketIO-client
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/s/socketIO-client/socketIO-client-0.5.6.tar.gz -> socketio-client-0.5.6.tar.gz
+_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=38a9cf3eb17b23bc7e933d3ae267f9c0
--- a/metadata/md5-cache/games-rpg/manaplus-1.5.7.18
+++ b/metadata/md5-cache/games-rpg/manaplus-1.5.7.18
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-libs/libX11 x11-misc/xdg-utils x11-apps/xmessage media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=5
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=nls opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-libs/libX11 x11-misc/xdg-utils x11-apps/xmessage media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts nls? ( virtual/libintl ) opengl? ( virtual/opengl ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://download.evolonline.org/manaplus/download/1.5.7.18/manaplus-1.5.7.18.tar.xz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=20b8717ead891893f8cf917c71e35f12
--- a/metadata/md5-cache/media-sound/exaile-3.4.5
+++ b/metadata/md5-cache/media-sound/exaile-3.4.5
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm
+DEPEND=nls? ( dev-util/intltool sys-devel/gettext )
+DESCRIPTION=a media player aiming to be similar to AmaroK, but for GTK+
+EAPI=5
+HOMEPAGE=http://www.exaile.org/
+IUSE=cddb libnotify nls python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=dev-python/dbus-python dev-python/gst-python:0.10 >=dev-python/pygtk-2.17 >=dev-python/pygobject-2.18:2 media-libs/gst-plugins-good:0.10 >=media-libs/mutagen-1.10 media-plugins/gst-plugins-meta:0.10 cddb? ( dev-python/cddb-py ) libnotify? ( dev-python/notify-python )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/exaile/exaile/archive/3.4.5.tar.gz -> exaile-3.4.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=3ddf6405a66baed9d7eabbc0af6bc227
--- a/metadata/md5-cache/media-sound/ezstream-0.6.0
+++ b/metadata/md5-cache/media-sound/ezstream-0.6.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 media-libs/libvorbis taglib? ( media-libs/taglib ) virtual/pkgconfig
+DESCRIPTION=A command line source client for Icecast media streaming servers
+EAPI=5
+HOMEPAGE=http://www.icecast.org/ezstream.php
+IUSE=taglib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 >=media-libs/libshout-2.2 media-libs/libvorbis taglib? ( media-libs/taglib ) net-misc/icecast
+SLOT=0
+SRC_URI=http://downloads.xiph.org/releases/ezstream/ezstream-0.6.0.tar.gz
+_md5_=74bb62e03bd250f109fc214f1b33f5eb
--- a/metadata/md5-cache/media-sound/gmtp-1.3.1-r300
+++ b/metadata/md5-cache/media-sound/gmtp-1.3.1-r300
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.16 media-libs/flac media-libs/libid3tag >=media-libs/libmtp-1.1.0 media-libs/libvorbis x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A simple MTP client for MP3 players
-EAPI=4
-HOMEPAGE=http://gmtp.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/glib-2.16 media-libs/flac media-libs/libid3tag >=media-libs/libmtp-1.1.0 media-libs/libvorbis x11-libs/gtk+:3
-SLOT=0
-SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.1-i386.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7e4e368464a10f14cd86b9cd774fe88d
--- a/metadata/md5-cache/media-sound/gmtp-1.3.4
+++ b/metadata/md5-cache/media-sound/gmtp-1.3.4
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A simple MTP client for MP3 players
-EAPI=4
-HOMEPAGE=http://gmtp.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3
-SLOT=0
-SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.4-i386.tar.gz
-_eclasses_=gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1408f4b55c86689c09af7ec060f1c3e6
--- a/metadata/md5-cache/media-sound/gmtp-1.3.9
+++ b/metadata/md5-cache/media-sound/gmtp-1.3.9
@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEFINED_PHASES=configure postinst postrm preinst
 DEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3 sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
 DESCRIPTION=A simple MTP client for MP3 players
-EAPI=4
+EAPI=5
 HOMEPAGE=http://gmtp.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 media-libs/flac media-libs/libid3tag media-libs/libmtp media-libs/libvorbis x11-libs/gtk+:3
 SLOT=0
-SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.3-i386.tar.gz
+SRC_URI=mirror://sourceforge/gmtp/gmtp-1.3.9.tar.gz
 _eclasses_=gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=17e09450fa0d91d263bb0515c8875866
+_md5_=a517ccbac201bf332bed39c21899035f
--- a/metadata/md5-cache/sci-biology/mothur-1.13.0-r1
+++ b/metadata/md5-cache/sci-biology/mothur-1.13.0-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-arch/unzip
-DESCRIPTION=A suite of algorithms for ecological bioinformatics
-EAPI=2
-HOMEPAGE=http://www.mothur.org/
-IUSE=mpi +readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=mirror://gentoo/mothur-1.13.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=62dbb989c31be0d653676a3195ed105f
--- a/metadata/md5-cache/sci-biology/mothur-1.13.0-r2
+++ b/metadata/md5-cache/sci-biology/mothur-1.13.0-r2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-arch/unzip
-DESCRIPTION=A suite of algorithms for ecological bioinformatics
-EAPI=2
-HOMEPAGE=http://www.mothur.org/
-IUSE=mpi +readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=mirror://gentoo/mothur-1.13.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fee219b51bf9a0e4c5cc2a2f95876aa7
--- a/metadata/md5-cache/sci-biology/mothur-1.27.0
+++ b/metadata/md5-cache/sci-biology/mothur-1.27.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=sci-biology/uchime mpi? ( virtual/mpi ) app-arch/unzip
-DESCRIPTION=A suite of algorithms for ecological bioinformatics
-EAPI=4
-HOMEPAGE=http://www.mothur.org/
-IUSE=mpi +readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sci-biology/uchime mpi? ( virtual/mpi )
-SLOT=0
-SRC_URI=http://www.mothur.org/w/images/c/cb/Mothur.1.27.0.zip -> mothur-1.27.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f1636b3a60e2788585e0b8cc4a8d228d
--- a/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
+++ b/metadata/md5-cache/sci-biology/mothur-1.27.0-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=sci-biology/uchime mpi? ( virtual/mpi ) app-arch/unzip virtual/fortran
+DESCRIPTION=A suite of algorithms for ecological bioinformatics
+EAPI=5
+HOMEPAGE=http://www.mothur.org/
+IUSE=mpi +readline
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sci-biology/uchime mpi? ( virtual/mpi ) virtual/fortran
+SLOT=0
+SRC_URI=http://www.mothur.org/w/images/c/cb/Mothur.1.27.0.zip -> mothur-1.27.0.zip
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a11b28a76261eff7e1bea1c3ef82fdf2
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.19
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.19
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.18 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.18.19
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-19.base.tar.xz mirror://gentoo/genpatches-3.18-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-19.experimental.tar.xz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=38d643c27e36449a29e46ec7efab7336
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.48-r2
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.48-r2
@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.48-r1
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.48-2.extras.tar.bz2 mirror://gentoo/genpatches-3.14-53.base.tar.xz
+SLOT=3.14.48-r2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.48-3.extras.tar.bz2 mirror://gentoo/genpatches-3.14-53.base.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=66ac1f22f59637aa105b07ad21a1524b
+_md5_=485d7413f435dd67823a2e71ebca56bc
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.1.3-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.1.3-r1
@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.1.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.1.3-1.extras.tar.bz2 mirror://gentoo/genpatches-4.1-7.base.tar.xz
+SLOT=4.1.3-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.1.3-2.extras.tar.bz2 mirror://gentoo/genpatches-4.1-7.base.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	adcd0a7bbb205c648e9cde3dd32126dc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=33f0efbc6bc3141384d024c3105ee409
+_md5_=baa222b19390ac831de27d7b1ec01e36
--- a/metadata/md5-cache/sys-process/audit-2.4.3
+++ b/metadata/md5-cache/sys-process/audit-2.4.3
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=ldap? ( net-nds/openldap ) sys-libs/libcap-ng python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-lang/swig ) >=sys-kernel/linux-headers-2.6.34 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Userspace utilities for storing and processing auditing records
+EAPI=5
+HOMEPAGE=http://people.redhat.com/sgrubb/audit/
+IUSE=ldap python 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 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=ldap? ( net-nds/openldap ) sys-libs/libcap-ng
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.4.3.tar.gz
+_eclasses_=autotools	2264f05fbbbaaf83d34ec81e72b38ffd	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6df394b58e518cae8f346c0b9ce46ee5
--- a/metadata/md5-cache/x11-terms/roxterm-2.9.3-r1
+++ b/metadata/md5-cache/x11-terms/roxterm-2.9.3-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup
+DEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.90 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxslt dev-python/lockfile virtual/pkgconfig || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) nls? ( app-text/po4a sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=A terminal emulator designed to integrate with the ROX environment
+EAPI=5
+HOMEPAGE=http://roxterm.sourceforge.net/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-3
+RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.28 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libSM x11-libs/vte:2.90
+SLOT=0
+SRC_URI=mirror://sourceforge/roxterm/roxterm-2.9.3.tar.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	4756de53ea4d40471a582e898815a5c8	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=0abf5010c6f1e52cc16069b1bb8ce708
--- a/metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1
+++ b/metadata/md5-cache/x11-wm/plwm-2.7_rc1-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-apps/texinfo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python classes for, and an implementation of, a window manager
+EAPI=5
+HOMEPAGE=http://plwm.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/python-xlib-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/plwm/PLWM-2.7rc1.tar.gz
+_eclasses_=distutils-r1	715b22a21726d3fd76b17e007c5daf5f	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	d9c8348f26710ea523a385c2328cf027	python-utils-r1	68e010c13e97b7b2c7bf403ee9c51e1b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=fe560f8d3d0e83651e85cffa123614e5
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 27 Jul 2015 17:11:08 +0000
+Mon, 27 Jul 2015 21:06:55 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Jul 27 17:11:05 UTC 2015
+Mon Jul 27 21:06:51 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 27 Jul 2015 17:30:01 +0000
+Mon, 27 Jul 2015 21:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1438017001 Mon 27 Jul 2015 05:10:01 PM UTC
+1438031101 Mon 27 Jul 2015 09:05:01 PM UTC
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16685 2015/07/27 16:43:21 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16686 2015/07/27 20:25:30 jlec 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
@ -230,9 +230,11 @@ virtual/httpd-php:5.3

 # Justin Lecher <jlec@gentoo.org> (28 Feb 2015)
 # Unfixed security problems
-# CVE-2015-{0219,0220,0221,0222}
+# CVE-2015-{0219,0220,0221,0222,5145}
 # #536586
+# #554864
 =dev-python/django-1.5*
+=dev-python/django-1.6*

 # Michał Górny <mgorny@gentoo.org> (11 Feb 2015)
 # Potentially destructive to @world, bug #539746.
--- a/sci-biology/mothur/Manifest
+++ b/sci-biology/mothur/Manifest
@ -1,3 +1,2 @@
-DIST mothur-1.13.0.zip 871838 SHA256 4fe62fcd9b8cc893aecce145ea851581d33f9c835d9dcd6405d9c80acf02ac77 SHA512 f862304120eb50edde1a3a0379d49202df52ea6725397d28490d2cadeaff67f7fd80f9c811f017855c0bde0e976a0fc2bc67ee0a62b634b741c77f1c3a1988eb WHIRLPOOL 5866487bfeb66588079d26f45cad3917fbaca65b2bf79025ca53f489f6b65cb39f316e2d31b4246fb4e05c01fd7a96f7a4d6de1cb1e83caf058d540647963e93
 DIST mothur-1.27.0.zip 7095054 SHA256 7521d0dfc849dc9ef707bf83032e471966914b9833247c49e5d30b8d9281a6c7 SHA512 81821ca95d4ce3f0d1e6aa920c4fe3fddd70f716157312ed0590c1c4ad728e6786bfe79f6badddcfb060ed5d1996cc1b5062c320a59209fef35f68e687ba3dd5 WHIRLPOOL 32e5c9c2be6e593b2dbc64be38c49b4dec3ea048cd3c972cf948136b394608a2dc168be58b7fb500a17fc6a152b7777fcd09b3f9fb3bf60c7dd92d043a4bf361
 DIST mothur-1.6.0.zip 465292 SHA256 75583a204d199ddcf9b845fc0adbaf240d7b1f08584fed5e6465982f68ffe121 SHA512 f775ff64991f00423108f295eca640f5c5d85a38e01b31af44ddf91f8897968e934f79899a21606dfd81fdc3e91751df277237e94d56d74f862e472e8da3386c WHIRLPOOL 31ca8decceb38ebd17f15c5f937df70b501833311cbf1aec794bb174d409a0c01e77abb399347781ad820c06411e56c566382a32818a0c57214aad2ad16cc132
--- a/sci-biology/mothur/files/mothur-1.13.0-makefile.patch
+++ b/sci-biology/mothur/files/mothur-1.13.0-makefile.patch
@ -1,43 +0,0 @@
-Fix build with --as-needed, respect CXX, CXXFLAGS
-
-http://www.mothur.org/forum/viewtopic.php?f=4&t=590
-http://bugs.gentoo.org/show_bug.cgi?id=339753
-
--- makefile
-+++ makefile
-@@ -11,7 +11,7 @@
- 
- # Optimize to level 3:
- 
-CXXFLAGS += -O3
-+#CXXFLAGS += -O3
- 
- MOTHUR_FILES = "\"Enter_your_default_path_here\""
- 
-@@ -49,7 +49,7 @@
- 
- ifeq  ($(strip $(USEREADLINE)),yes)
-     CXXFLAGS += -DUSE_READLINE
-    LDFLAGS += \
-+    LIBS = \
-       -lreadline\
-       -lncurses
- endif
-@@ -57,7 +57,7 @@
- USEMPI ?= no
- 
- ifeq  ($(strip $(USEMPI)),yes)
-    CXX = mpic++
-+#    CXX = mpic++
-     CXXFLAGS += -DUSE_MPI
- endif
- 
-@@ -74,7 +74,7 @@
- OBJECTS=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
- 
- mothur : $(OBJECTS)
-	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS)
-+	$(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
- 
- install : mothur
- 	cp mothur ../Release/mothur
--- a/sci-biology/mothur/files/mothur-1.13.0-overflows.patch
+++ b/sci-biology/mothur/files/mothur-1.13.0-overflows.patch
@ -1,82 +0,0 @@
-Fix buffer overflows
-
-http://www.mothur.org/forum/viewtopic.php?f=4&t=591
-
--- Mothur.source/filterseqscommand.cpp
-+++ Mothur.source/filterseqscommand.cpp
-@@ -305,8 +305,8 @@
- 					
- 					//wait on chidren
- 					for(int i = 1; i < processors; i++) { 
-						char buf[4];
-						MPI_Recv(buf, 4, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
-+						char buf[5];
-+						MPI_Recv(buf, 5, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
- 					}
- 					
- 				}else { //you are a child process
-@@ -326,11 +326,11 @@
- 					
- 					if (m->control_pressed) {  MPI_File_close(&inMPI);  MPI_File_close(&outMPI);  return 0;  }
- 					
-					char buf[4];
-+					char buf[5];
- 					strcpy(buf, "done"); 
- 					
- 					//tell parent you are done.
-					MPI_Send(buf, 4, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
-+					MPI_Send(buf, 5, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
- 				}
- 				
- 				MPI_File_close(&outMPI);
--- Mothur.source/distancecommand.cpp
-+++ Mothur.source/distancecommand.cpp
-@@ -271,8 +271,8 @@
- 				for(int i = 1; i < processors; i++) { 
- 					if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
- 					
-					char buf[4];
-					MPI_Recv(buf, 4, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
-+					char buf[5];
-+					MPI_Recv(buf, 5, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
- 				}
- 			}else { //you are a child process
- 				//do your part
-@@ -280,10 +280,10 @@
- 				
- 				if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
- 			
-				char buf[4];
-+				char buf[5];
- 				strcpy(buf, "done"); 
- 				//tell parent you are done.
-				MPI_Send(buf, 4, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
-+				MPI_Send(buf, 5, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
- 			}
- 			
- 			MPI_File_close(&outMPI);
--- Mothur.source/chimeracheckcommand.cpp
-+++ Mothur.source/chimeracheckcommand.cpp
-@@ -269,8 +269,8 @@
- 					
- 					//wait on chidren
- 					for(int j = 1; j < processors; j++) { 
-						char buf[4];
-						MPI_Recv(buf, 4, MPI_CHAR, j, tag, MPI_COMM_WORLD, &status); 
-+						char buf[5];
-+						MPI_Recv(buf, 5, MPI_CHAR, j, tag, MPI_COMM_WORLD, &status); 
- 					}
- 				}else{ //you are a child process
- 					MPI_Recv(&numSeqs, 1, MPI_INT, 0, tag, MPI_COMM_WORLD, &status);
-@@ -288,9 +288,9 @@
- 					if (m->control_pressed) {  MPI_File_close(&inMPI);  MPI_File_close(&outMPI);   for (int j = 0; j < outputNames.size(); j++) {	remove(outputNames[j].c_str());	}  delete chimera; return 0;  }
- 					
- 					//tell parent you are done.
-					char buf[4];
-+					char buf[5];
- 					strcpy(buf, "done"); 
-					MPI_Send(buf, 4, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
-+					MPI_Send(buf, 5, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
- 				}
- 				
- 				//close files 
--- a/sci-biology/mothur/files/mothur-1.13.0-overflows2.patch
+++ b/sci-biology/mothur/files/mothur-1.13.0-overflows2.patch
@ -1,77 +0,0 @@
- clearcutcommand.cpp |   32 ++++++++++++++++----------------
- 1 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/clearcutcommand.cpp b/clearcutcommand.cpp
-index 1a7ab1f..256aa4d 100644
--- a/clearcutcommand.cpp
-+++ b/clearcutcommand.cpp
-@@ -180,33 +180,33 @@ int ClearcutCommand::execute() {
- 		
- 		vector<char*> cPara;
- 		
-		char* tempClearcut = new char[8];  strcpy(tempClearcut, "clearcut");  cPara.push_back(tempClearcut);
-+		char* tempClearcut = new char[16];  strcpy(tempClearcut, "clearcut");  cPara.push_back(tempClearcut);
- 				
- 		//you gave us a distance matrix
-		if (phylipfile != "") {  char* temp = new char[10];  strcpy(temp, "--distance");  cPara.push_back(temp);	}
-+		if (phylipfile != "") {  char* temp = new char[16];  strcpy(temp, "--distance");  cPara.push_back(temp);	}
- 		
- 		//you gave us a fastafile
-		if (fastafile != "") { char* temp = new char[11];  strcpy(temp, "--alignment");  cPara.push_back(temp); 	}
-+		if (fastafile != "") { char* temp = new char[16];  strcpy(temp, "--alignment");  cPara.push_back(temp); 	}
- 		
-		if (version)			{  char* temp = new char[9];  strcpy(temp, "--version");  cPara.push_back(temp);	}
-		if (verbose)			{  char* temp = new char[9];  strcpy(temp, "--verbose");  cPara.push_back(temp);	}
-		if (quiet)				{  char* temp = new char[7];  strcpy(temp, "--quiet");  cPara.push_back(temp);	}
-+		if (version)			{  char* temp = new char[16];  strcpy(temp, "--version");  cPara.push_back(temp);	}
-+		if (verbose)			{  char* temp = new char[16];  strcpy(temp, "--verbose");  cPara.push_back(temp);	}
-+		if (quiet)				{  char* temp = new char[16];  strcpy(temp, "--quiet");  cPara.push_back(temp);	}
- 		if (seed != "*")		{  
- 			string tempSeed = "--seed=" + seed;
- 			char* temp = new char[tempSeed.length()];
- 			strcpy(temp, tempSeed.c_str());
- 			cPara.push_back(temp);
- 		}
-		if (norandom)			{  char* temp = new char[10];  strcpy(temp, "--norandom");  cPara.push_back(temp);	}
-		if (shuffle)			{  char* temp = new char[9];  strcpy(temp, "--shuffle");  cPara.push_back(temp);	}
-		if (neighbor)			{  char* temp = new char[10];  strcpy(temp, "--neighbor");  cPara.push_back(temp);	}
-+		if (norandom)			{  char* temp = new char[16];  strcpy(temp, "--norandom");  cPara.push_back(temp);	}
-+		if (shuffle)			{  char* temp = new char[16];  strcpy(temp, "--shuffle");  cPara.push_back(temp);	}
-+		if (neighbor)			{  char* temp = new char[16];  strcpy(temp, "--neighbor");  cPara.push_back(temp);	}
- 		
- 		string tempIn = "--in=" + inputFile;  
- 		char* tempI = new char[tempIn.length()];
- 		strcpy(tempI, tempIn.c_str());
- 		cPara.push_back(tempI);
- 		
-		if (stdoutWanted)		{  char* temp = new char[8];  strcpy(temp, "--stdout");  cPara.push_back(temp);	}
-+		if (stdoutWanted)		{  char* temp = new char[16];  strcpy(temp, "--stdout");  cPara.push_back(temp);	}
- 		else{  
- 			string tempOut = "--out=" + outputName;  
- 			
-@@ -215,10 +215,10 @@ int ClearcutCommand::execute() {
- 			cPara.push_back(temp);
- 		}
- 			
-		if (DNA)				{  char* temp = new char[5];  strcpy(temp, "--DNA");  cPara.push_back(temp);		}
-		if (protein)			{  char* temp = new char[9];  strcpy(temp, "--protein");  cPara.push_back(temp);	}
-		if (jukes)				{  char* temp = new char[7];  strcpy(temp, "--jukes");  cPara.push_back(temp);		}
-		if (kimura)				{ char* temp = new char[8];  strcpy(temp, "--kimura");  cPara.push_back(temp);		}
-+		if (DNA)				{  char* temp = new char[16];  strcpy(temp, "--DNA");  cPara.push_back(temp);		}
-+		if (protein)			{  char* temp = new char[16];  strcpy(temp, "--protein");  cPara.push_back(temp);	}
-+		if (jukes)				{  char* temp = new char[16];  strcpy(temp, "--jukes");  cPara.push_back(temp);		}
-+		if (kimura)				{ char* temp = new char[16];  strcpy(temp, "--kimura");  cPara.push_back(temp);		}
- 		if (matrixout != "")	{  
- 			string tempMatrix =  "--matrixout=" + outputDir + matrixout; 
- 			char* temp = new char[tempMatrix.length()];
-@@ -233,8 +233,8 @@ int ClearcutCommand::execute() {
- 			cPara.push_back(temp);
- 		}
- 
-		if (expblen)			{ char* temp = new char[9];  strcpy(temp, "--expblen");  cPara.push_back(temp); 	}
-		if (expdist)			{ char* temp = new char[9];  strcpy(temp, "--expdist");  cPara.push_back(temp);	}
-+		if (expblen)			{ char* temp = new char[16];  strcpy(temp, "--expblen");  cPara.push_back(temp); 	}
-+		if (expdist)			{ char* temp = new char[16];  strcpy(temp, "--expdist");  cPara.push_back(temp);	}
- 		
- 		char** clearcutParameters;
- 		clearcutParameters = new char*[cPara.size()];
--- a/sci-biology/mothur/mothur-1.13.0-r1.ebuild
+++ b/sci-biology/mothur/mothur-1.13.0-r1.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/mothur-1.13.0-r1.ebuild,v 1.3 2012/08/14 15:37:59 jlec Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A suite of algorithms for ecological bioinformatics"
-HOMEPAGE="http://www.mothur.org/"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="mpi +readline"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-RDEPEND="mpi? ( virtual/mpi )"
-
-S=${WORKDIR}/Mothur.source
-
-pkg_setup() {
-	use mpi && CXX=mpicxx || CXX=$(tc-getCXX)
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-overflows.patch
-}
-
-use_yn() {
-	use $1 && echo "yes" || echo "no"
-}
-
-src_compile() {
-	emake USEMPI=$(use_yn mpi) USEREADLINE=$(use_yn readline) || die
-}
-
-src_install() {
-	dobin ${PN}
-}
--- a/sci-biology/mothur/mothur-1.13.0-r2.ebuild
+++ b/sci-biology/mothur/mothur-1.13.0-r2.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/mothur-1.13.0-r2.ebuild,v 1.1 2012/08/14 15:37:59 jlec Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A suite of algorithms for ecological bioinformatics"
-HOMEPAGE="http://www.mothur.org/"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="mpi +readline"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-RDEPEND="mpi? ( virtual/mpi )"
-
-S=${WORKDIR}/Mothur.source
-
-pkg_setup() {
-	use mpi && CXX=mpicxx || CXX=$(tc-getCXX)
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-overflows.patch \
-		"${FILESDIR}"/${P}-overflows2.patch
-}
-
-use_yn() {
-	use $1 && echo "yes" || echo "no"
-}
-
-src_compile() {
-	emake USEMPI=$(use_yn mpi) USEREADLINE=$(use_yn readline) || die
-}
-
-src_install() {
-	dobin ${PN}
-}
--- a/sci-biology/mothur/mothur-1.27.0-r1.ebuild
+++ b/sci-biology/mothur/mothur-1.27.0-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/mothur-1.27.0.ebuild,v 1.1 2012/08/14 15:37:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mothur/mothur-1.27.0-r1.ebuild,v 1.1 2015/07/27 18:42:15 jlec Exp $

-EAPI=4
+EAPI=5

-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils flag-o-matic fortran-2 toolchain-funcs

 DESCRIPTION="A suite of algorithms for ecological bioinformatics"
 HOMEPAGE="http://www.mothur.org/"
@ -24,9 +24,9 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/Mothur.source

 pkg_setup() {
+	fortran-2_pkg_setup
 	use mpi && export CXX=mpicxx || export CXX=$(tc-getCXX)
-	use amd64 && append-flags -DBIT_VERSION
-	tc-export FC
+	use amd64 && append-cppflags -DBIT_VERSION
 }

 src_prepare() {
@ -35,12 +35,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-overflows.patch
 }

-use_yn() {
-	use $1 && echo "yes" || echo "no"
-}
-
 src_compile() {
-	emake USEMPI=$(use_yn mpi) USEREADLINE=$(use_yn readline)
+	emake USEMPI=$(usex mpi) USEREADLINE=$(usex readline)
 }

 src_install() {
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@ -28,6 +28,9 @@ DIST genpatches-3.18-17.extras.tar.xz 16184 SHA256 cadde114f6229bbb92092ae76a0db
 DIST genpatches-3.18-18.base.tar.xz 578860 SHA256 49e03e36c5f4fa9d0b98f74c225d6739a331d124d99ef0162abd6403d8b0235f SHA512 ba788c6264537cd121e8dfdf7d2c9997286f096734fa0971e5b9a93af75f7584ba766f848308964034d830cc5fc7726f0e02ccbfb9234c671f305e1983253087 WHIRLPOOL fc2419b6f42d03c7de4311b468fac523805360b7328494ee302ada0f9aad8ecddc74960db3c608671a6666e4b292f3f991fdd29ec6f30fd13dfac7174714839c
 DIST genpatches-3.18-18.experimental.tar.xz 61636 SHA256 507064665e98b77d0350b1787ae13f7120ae74f31c499f023140ebaf6b0c67d1 SHA512 460bcd57c9a87b9eeed2bdf2488d3d9173b08d9f016d6bd298bf321775724581b520e0e14d42fb1d8da302c4b987f5ff2c15f8d5cfee7ffe93946b42fbf6a3f4 WHIRLPOOL 6cf7bb28aeee276be6991b9add56f19f9e4448e575bca663a17051d16e0db5abb78eb0963638977c6f89c639507e1ad8526db514d5c68883997303710d78dce0
 DIST genpatches-3.18-18.extras.tar.xz 16188 SHA256 7467a3104b0864b5e2ca01c3ed691ff001d3e29bc6f7e9dac32ff80edd6be7f7 SHA512 0ac07dc12cf89309c450b446f5db224134a8f69a1c21d17e7e178606084f603e3c719d4487573a7f9b8cc960a1d19bed9661bc288538f87cf349d794f4effd12 WHIRLPOOL eb23a89af6adc3885ed856ad1649338839fcecb2092c4aff0fa6b0643bc9baca0c664c4a02009d3e79db44f51a88a7d76ec464b3b752a4eebe061ef3a1bbef3f
+DIST genpatches-3.18-19.base.tar.xz 591336 SHA256 346d9ce9b825e024cb448c768b9e994ef27a4693cd7eb596295f1419dd3cbca9 SHA512 5d8c4550dc8afc0687d309f586200e908d2e71ce0ec6dfc86bbe26b3437e46927a6041278b97ed2087d8aafefddbb5d6162d9e22fa566c7f9eb1e57017dad6d4 WHIRLPOOL d9f29c9dc5b3995ff59b7e4f93617ad360ecb32c6fe6702daa4826277e98ef35ca3a1fd9817cf011ba43eedc14a54ebed6134f348245fceb56298baee6b73ece
+DIST genpatches-3.18-19.experimental.tar.xz 61628 SHA256 7a34377e5c43214cc03c00e983a1996e955b3fdfc53be01ac1f84b9578c25287 SHA512 4ac764f6b11985fd63a4b392791e1a4467867ffe00f464115e8982a199cafc6a45489c704aee2a1ef9afefab93a1b110f8ccec597e6b4bf61e61f5b996d5fd36 WHIRLPOOL f2cbcf0efbe7929b0c1360b53c15bd9d6502916d664eec23aeda56e5c626d49fc2caa833e793a5a4ffed20591ff48e944ecff11c997fb5ef4aaaec066e745236
+DIST genpatches-3.18-19.extras.tar.xz 16176 SHA256 b1a797dba4a735d95a635bfd40b03e2cb83e0fedb0d50735a3eaa2cfe7898c68 SHA512 d77e4f337621b8e424f93e4433628f065895e8568f87daee82a46dfba12f7547d50edf71ece0dd9bc6356dfb9af356fc334111923c29aa61218ecf797b5bff2c WHIRLPOOL ab37e325b7be6a5a1dd9f959f9db3f46cfee3d903721c1ee1c896f66495d46ec908367cecac13a279756ab528c7f3788c90689ba717122874b430f7ec445b0fc
 DIST genpatches-3.19-9.base.tar.xz 257836 SHA256 94ca8760c25b14e705dbdc4584c78b4ba71655bcb3529c9fed3a24c41e144231 SHA512 118bd7d89bd7652ae44cd01042f865a846668ac2976f2344e9f72d6dadb4c3fdfda738e7a971656519831cbfdb6cc07a8c9b4513c88be707c3eb707d6e75a8f8 WHIRLPOOL 38df4344680cb3d38c384ac6a7ec2dfaf591cccca3795a1a1150cbf410ec4e4e8affa816c5dc3448b0310dd2b9c12e220aa6b85820fd9c68c8441ad6c2846e73
 DIST genpatches-3.19-9.experimental.tar.xz 61632 SHA256 c1668cb0ebe2c04a5f9d837cd0b42378ec9c1c53cacc4b02272462bd9e773c88 SHA512 86738abd9ce9eb007c96388a18710d8005760f5f2c36d12388af6d88cea2b60f81c2debe8d3e0af8f4ac83619a4797aa5a77b73c83adca1cbc6f397005c66561 WHIRLPOOL 8c8c5931b69a99106f38309df1367db16f6935357db1ed48a2fbeff5c266ac4801803485446d5a8a292c1c29d851c1b32dcc8ce161c6646227b9f1e75ae7621b
 DIST genpatches-3.19-9.extras.tar.xz 16280 SHA256 f0b77c7754741f000933a1450c39027c509ca66b44e78add44b100b02e415e5c SHA512 764e704d43573b80604f090b35b4c5913cc8d8abcb8f94590621df879668fdd0607db1a711a6fb24dd7b2ad709dff1110381e4b8072ad435ef7356639d8baacf WHIRLPOOL 6e8243526c27642cade7d1e9b36c6453c7a5ea63e99abae77ebd866365543930d1ee685b7a447f38e40bc8cfcbe84b01cbc8f5a6e443fe732b8e14ff3487a45d
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.18.19.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.19.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.18.19.ebuild,v 1.1 2015/07/27 17:07:43 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@ -20,14 +20,14 @@ DIST genpatches-4.1-7.base.tar.xz 59032 SHA256 9106e15001e0c286ef929d5e4505507cc
 DIST hardened-patches-3.14.35-1.extras.tar.bz2 869361 SHA256 c743b5951d08680567246533fef192a348ce6f4640580fc19471c05ce48f57fd SHA512 b5b7f9cc2b57d5f74ec5d71762593cbb6c7c1c1e65fe2577d8ca74d18b4331e97dfd9fa781670eddd209149a434db0da04e3b7ffc23350ac2d725db2355c5353 WHIRLPOOL 927ff1905bd7a55d6231891a5d3fc2b2701fcb836167f0da168529a34d4d64e3c6fcffe190827ec7572b68f61e310e4882bf883aba2f1d55781a8887d8be4c6b
 DIST hardened-patches-3.14.43-4.extras.tar.bz2 969523 SHA256 4aa9b820a1e302df33dfba574e609fe8ccd25143054124bcb7bb06ea19ca9f59 SHA512 52cf7cb51bec66d6732f391c2413a5ae7e748f1c4eea346737b885b4e1d937b0d8b5a0ce7cc0959526b774304f2372341bc4c2be583e77f854cc897c1bfb2480 WHIRLPOOL 8d7b1e965acfc68ae8b4d0d19168a1317ae0a0e4a1a75735ee9d54a356b3410312908ae83488cf1ddab238a5f63e5f36c7e286713b28e8ff820bf933b4b2904e
 DIST hardened-patches-3.14.48-1.extras.tar.bz2 997773 SHA256 e8be8af4006dde34d9174fa659c8cdccc836da340d17d6ccf0aced1f3ae4f1c8 SHA512 5c7f33594e5063f09d5d5cba75e0ca7d1d08d8cee8f104630ff376364fc340647a9a3d83107abc7d0775273a802b6f22b195df7df21fa0caa21ca070d1af075f WHIRLPOOL 3f050ba87cc7a44ec0c9e79f41f22ebc717e6fe4f822426371473dfbdac6327e600a855987b8af870f343cb41f9e437fc4427e1402e4677a46d7235b22507c09
-DIST hardened-patches-3.14.48-2.extras.tar.bz2 990225 SHA256 5732d8a2210e62e86df48db954b244bad051c12b9a60ab099b2bfba0423a5cbf SHA512 46417a9c349cf6aa2e63073a6b8023701754f967ca121603dfc167be72bc3f3809911c1b2284edbef6a2be372a98b9c9711801ad9ae51ca7df501b52933457d6 WHIRLPOOL f2a36553aa8745afe26d3cd18a923b169760aaa19c51b24f0c22c148b4474e321c48368a417067be86ec72973cb1f81f752c694393fb8ad1d841621aa273f74a
+DIST hardened-patches-3.14.48-3.extras.tar.bz2 1052329 SHA256 1559e8e4af0f8f7abc41d04d6faa83f003c9ed33aeb3adef520388f8eb557b35 SHA512 7b6f6928a2619ac73675dec5193bb02a81c272468b8e832f775d670acdd4a1685d89aeb0535dabb30158939820a66f997828812311b5531528f56923c0509ed1 WHIRLPOOL da30515b470e6283f730beddaa2d14013b7c797c15b0ebfa5b8dd96c0bf5f421151beafa20e57608a24edae5900679dee01c4bbffa64df42cc687b0545283136
 DIST hardened-patches-3.18.9-1.extras.tar.bz2 896609 SHA256 8b587954838d063a97491cb0bd56bb82db1898f5a10b5a142a0b9175cec67610 SHA512 d24f4080ba0437939c296614659477aa3d535cb3f3c950cc2a695c3925c8a04cab543b1277e48ba05a6e58cd31762473ad5d2b54e9c5aaf5b1a1b46965a7166e WHIRLPOOL 73abf5b3c1c6b868b931357d11707b41a6d4bee8fd5e2d8306ee3830a0edd24f371159b8f8efbd2b1afbc21efb045e96b2994219d43ee7ab484116e86e136196
 DIST hardened-patches-3.2.68-1.extras.tar.bz2 2221390 SHA256 783fe31d10548f0d6e24c8613e97a63d7c35f4ba407239990ffdaf8ced9ba855 SHA512 3d232742b71c86359aed8f28198f9af0bc800197aed0ff5a14953dab0fdb0ce320a77d442f2109fbe3185512be3c7e12b4e3efe8cb432bfc3da4d7573e6a4197 WHIRLPOOL a4d495b49ef6c94d3290079b6c9209a82872ae24ba7405c57a2a8d5ac3a659d8cb388770491ff0666446134a75bb064917eee71d54a4d3ee35de4a0df7fc0e82
 DIST hardened-patches-3.2.69-11.extras.tar.bz2 2293649 SHA256 98b7cf52c368d3f54330f8a821bd83e9d1aa96025438640d5657e599191282be SHA512 6ae2fa4a0b1d89d84f166af6347aad7179eb6031efe6bd9fb6fcd96ac6a4f9597ccdc34661c0ac92b85b24818a2bb99eeac4c4728587853255c81c98969a8c58 WHIRLPOOL 997f47848a14a512e15d7b3635c1c924000dcd9ce8992aac312764bc065474beebf5de53561eb3a1b72feb4f6a176a4500dd054b32d5f4b35eee4e3a9c7824df
 DIST hardened-patches-3.2.69-13.extras.tar.bz2 2320523 SHA256 532536303b89962f4687de07715e2bcc0733858df56cccdef42915914bfbfa4d SHA512 d0ed3a9e8ffb936726b753ce43b1406162a16ea29703d8f34904878af1b687160c766bdb34225149188e585df440d57f46725c62ebda25a5c0d8316fc2f3509d WHIRLPOOL 38cd562c26f7a7d7550d5242a412421649aeb8d9a0fdf33a94a2a833a72b643acb67793c39ef50df7eca334eb24a2cec7413ce490b6cf05b146bc273759198cf
 DIST hardened-patches-3.2.69-5.extras.tar.bz2 2288972 SHA256 34714276b7f676a6e8318419b9e01af1064442da70bc1b28d349f8c0d7efc951 SHA512 02ba31182d16588ecf503abd37a34675e1b6e35ceed5653a15bd63f2ee4f38946c6c6603e9428d2a4d3d0d186b954d20f7a5e75f0feea952c76ab8f9739ad635 WHIRLPOOL a708cfb3c4a764f2399c21a9380ac278b65d0280c8b05118c8ecf99a937e91a84e89c40f273f486da6e04aefcac737ee8f4b412418845237f65c2774ba24baf4
 DIST hardened-patches-4.0.8-1.extras.tar.bz2 1366743 SHA256 765a06197afb4b7f268778b5ba2a6ca438b20bf900ca97cbc17b47570cf1dd0e SHA512 782a7883e055173a1cf6be76e8d99a56757f5576c09fb80c295e6bc926d7dd8e6fbfc4fd09c38e0e95d4f0317808b68a9fbb0e9b59a9a3f27b89f906f375e619 WHIRLPOOL ea95c5d29801759d2ed247885095c914ee07c4b800cb9a2f5f1c4b7b79347d2853ae56f64ad732c6aa8972a43e8993fdcfabf5e244d5994fa7998a382faebfe7
-DIST hardened-patches-4.1.3-1.extras.tar.bz2 1358773 SHA256 d144fb7bca7d1ab580b4558b3a0dbb7e3269f14e0de52446afacd68dbbdd474b SHA512 da679f0d6b35441a0a455b85bb445ca9d66e7a526a5e8fa08b5467fe5616f2967f45df45dbc6f0180cfc0d809ec34f3af862fa264bff8cef6240487d3073e7e6 WHIRLPOOL e950fe193a8c26abe61cf2f76480242680660eb954f96fc30268e5a58c2ac9c94a8c4672c5524d655e8cabf6f267430dd4f6371c8f52a8f62f48f5df39079f90
+DIST hardened-patches-4.1.3-2.extras.tar.bz2 1420892 SHA256 ff83178288e51b06b7e9a3963cb2082c3f8a373c46a423bbdff76bff9336bc8b SHA512 91ff31f4593125cd27537d6aab8ac81b2847350a5b7b59f2ae4545b8ca51d07ebac346d4cd9b1561e862ffa5d912596c41ef736a2af253c1b05545323a4b35b2 WHIRLPOOL 6adf41d36320adf8f37b0444b4a838831ed6d564141db9cb810089a642644222b96b9114623c66c6226435071f26bcbc6728de7c490602093a0cfbfb78040631
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.48-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.48-r2.ebuild
@ -1,18 +1,18 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-4.1.3.ebuild,v 1.1 2015/07/27 01:37:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.48-r2.ebuild,v 1.1 2015/07/27 18:07:57 blueness Exp $

 EAPI="5"

 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="7"
+K_GENPATCHES_VER="53"
 K_DEBLOB_AVAILABLE="1"

 inherit kernel-2
 detect_version

-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"

--- a/sys-kernel/hardened-sources/hardened-sources-3.14.48-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.48-r1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.48-r1.ebuild,v 1.1 2015/07/27 01:33:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-4.1.3-r1.ebuild,v 1.1 2015/07/27 18:11:19 blueness Exp $

 EAPI="5"

 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="53"
+K_GENPATCHES_VER="7"
 K_DEBLOB_AVAILABLE="1"

 inherit kernel-2
--- a/sys-process/audit/Manifest
+++ b/sys-process/audit/Manifest
@ -3,3 +3,4 @@ DIST audit-2.0.5.tar.gz 810519 SHA256 1ef85e606a0fda21596577f5c205c0df7eb56d7cff
 DIST audit-2.1.3.tar.gz 833647 SHA256 1c61858d8ed299128aa6bd8e85bac758bfe33e61358d259e52acb7d961fee90e SHA512 0f5c02ee3eb35687e85cfea0cae2bc11c35d2de5c44347f8f3cde4d268aeef215547cfb4b577afffc737ce5944219f46b4594ac122479d8b2e185efe3cdb069b WHIRLPOOL c83ac2bf929f524c4bc34ffcd503db9687a2c8affe3b5bb0a908e40ba8e98beced6fee6f3212db7267cf11cef3dbd13915a1ee09334f2cf58a686a1acfff0946
 DIST audit-2.2.2.tar.gz 907066 SHA256 8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b SHA512 98d83162e69816611dfac3d3ecc19235403ea5809d7a5cd9f13444c2085f03e46657802addb58ee31c251749f89417926ae40bcd99a77d64f062712830fde9bb WHIRLPOOL f127d3b9645d4e679a83767d688b83c7d59d4a35a166bc9f5038df89852768b695bc0c30e26fea0930aa29fed4583aa5218a42d5898d2a7c542e04cf58b9a9e9
 DIST audit-2.4.1.tar.gz 942147 SHA256 059346fa0e922faf4dcc054382b21f4845cd8c4942e82cfd0d4cd52bd2b03026 SHA512 4ca29ee2c784861f75f9e05f5c4dfc3d3ebb9d51e454e8a069ef4d08db3754fb19189714935351e70b26ed44347a266ae6c31e68361d5e9efd89f657f91dbd50 WHIRLPOOL 49ecfdd2363eb8bcf25d40b36bf228c8bd31611804b284dde004d42a250a39c387bd0abff223cf4041f62805d5bb189a19375f5806385344ca219d823d267f2e
+DIST audit-2.4.3.tar.gz 998974 SHA256 9c914704fecc602e143e37152f3efbab2469692684c1a8cc1b801c1b49c7abc6 SHA512 2bbaa11ed5e2d8138711df325ec1997c4eb955123699fd330b5272b7f3475ca61c9753e1c103abfc9c49e1fc8aaf52dbd55545e3f1874214979ddece64ad79aa WHIRLPOOL 1a0c0a273fddc49d15322a2423d4038488738d6597d0641182befab91646355bbee393a5d09d446dc4cf2f4579dd7ea99928cadd77bc72c355db0a10d4964da5
--- a/sys-process/audit/audit-2.4.3.ebuild
+++ b/sys-process/audit/audit-2.4.3.ebuild
@ -0,0 +1,221 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.4.3.ebuild,v 1.1 2015/07/27 18:23:11 perfinion Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info eutils systemd
+
+DESCRIPTION="Userspace utilities for storing and processing auditing records"
+HOMEPAGE="http://people.redhat.com/sgrubb/audit/"
+SRC_URI="http://people.redhat.com/sgrubb/audit/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ldap python"
+# Testcases are pretty useless as they are built for RedHat users/groups and
+# kernels.
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap )
+		 sys-libs/libcap-ng"
+DEPEND="${RDEPEND}
+	python? ( ${PYTHON_DEPS}
+		dev-lang/swig )
+	>=sys-kernel/linux-headers-2.6.34"
+# Do not use os-headers as this is linux specific
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~AUDIT"
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch_user
+
+	# Do not build GUI tools
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac || die
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		"${S}"/Makefile.am || die
+	rm -rf "${S}"/system-config-audit
+
+	if ! use ldap; then
+		sed -i \
+			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
+			"${S}"/configure.ac || die
+		sed -i \
+			-e '/^SUBDIRS/s,zos-remote,,g' \
+			"${S}"/audisp/plugins/Makefile.am || die
+	fi
+
+	# Don't build static version of Python module.
+	epatch "${FILESDIR}"/${PN}-2.4.3-python.patch
+
+	# glibc/kernel upstreams suck with both defining ia64_fpreg
+	# This patch is a horribly workaround that is only valid as long as you
+	# don't need the OTHER definitions in fpu.h.
+	epatch "${FILESDIR}"/${PN}-2.1.3-ia64-compile-fix.patch
+
+	# there is no --without-golang conf option
+	sed -e "/^SUBDIRS =/s/ @gobind_dir@//" -i bindings/Makefile.am || die
+
+	# Regenerate autotooling
+	eautoreconf
+
+	# Bug 352198: Avoid parallel build fail
+	cd "${S}"/src/mt
+	[[ ! -s private.h ]] && ln -s ../../lib/private.h .
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	econf \
+		--sbindir=/sbin \
+		--enable-systemd \
+		--without-python \
+		--without-python3
+
+	if multilib_is_native_abi; then
+		python_configure() {
+			mkdir -p "${BUILD_DIR}" || die
+			cd "${BUILD_DIR}" || die
+
+			if python_is_python3; then
+				econf --without-python --with-python3
+			else
+				econf --with-python --without-python3
+			fi
+		}
+
+		use python && python_foreach_impl python_configure
+	fi
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+
+		python_compile() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef}
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef}
+		}
+
+		local native_build="${BUILD_DIR}"
+		use python && python_foreach_impl python_compile
+	else
+		emake -C lib
+		emake -C auparse
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" initdir="$(systemd_get_unitdir)" install
+
+		python_install() {
+			local pysuffix pydef
+			if python_is_python3; then
+				pysuffix=3
+				pydef='USE_PYTHON3=true'
+			else
+				pysuffix=2
+				pydef='HAVE_PYTHON=true'
+			fi
+
+			emake -C "${BUILD_DIR}"/bindings/swig \
+				VPATH="${native_build}/lib" \
+				LIBS="${native_build}/lib/libaudit.la" \
+				_audit_la_LIBADD="${native_build}/lib/libaudit.la" \
+				_audit_la_DEPENDENCIES="${S}/lib/libaudit.h ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+			emake -C "${BUILD_DIR}"/bindings/python/python${pysuffix} \
+				VPATH="${S}/bindings/python/python${pysuffix}:${native_build}/bindings/python/python${pysuffix}" \
+				auparse_la_LIBADD="${native_build}/auparse/libauparse.la ${native_build}/lib/libaudit.la" \
+				${pydef} \
+				DESTDIR="${D}" install
+		}
+
+		local native_build=${BUILD_DIR}
+		use python && python_foreach_impl python_install
+
+		# things like shadow use this so we need to be in /
+		gen_usr_ldscript -a audit auparse
+	else
+		emake -C lib DESTDIR="${D}" install
+		emake -C auparse DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog README* THANKS TODO
+	docinto contrib
+	dodoc contrib/{*.rules,avc_snap,skeleton.c}
+	docinto contrib/plugin
+	dodoc contrib/plugin/*
+
+	newinitd "${FILESDIR}"/auditd-init.d-2.1.3 auditd
+	newconfd "${FILESDIR}"/auditd-conf.d-2.1.3 auditd
+
+	[ -f "${D}"/sbin/audisp-remote ] && \
+	dodir /usr/sbin && \
+	mv "${D}"/{sbin,usr/sbin}/audisp-remote || die
+
+	# Gentoo rules
+	insinto /etc/audit/
+	newins "${FILESDIR}"/audit.rules-2.1.3 audit.rules
+	doins "${FILESDIR}"/audit.rules.stop*
+
+	# audit logs go here
+	keepdir /var/log/audit/
+
+	# Security
+	lockdown_perms "${D}"
+
+	prune_libtool_files --modules
+}
+
+pkg_preinst() {
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
+pkg_postinst() {
+	lockdown_perms "${ROOT}"
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
+}
+
+lockdown_perms() {
+	# upstream wants these to have restrictive perms
+	basedir="$1"
+	chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
+	chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null
+	chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null
+}
--- a/sys-process/audit/files/audit-2.4.3-python.patch
+++ b/sys-process/audit/files/audit-2.4.3-python.patch
@ -0,0 +1,46 @@
+diff -ur audit-2.4.3.orig/bindings/python/python2/Makefile.am audit-2.4.3/bindings/python/python2/Makefile.am
+--- audit-2.4.3.orig/bindings/python/python2/Makefile.am	2015-07-22 23:35:24.315424091 +0800
+++ audit-2.4.3/bindings/python/python2/Makefile.am	2015-07-22 23:37:16.861510504 +0800
+@@ -29,5 +29,6 @@
+ 
+ auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c
+ auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS)
+-auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
+auparse_la_CFLAGS = -shared
+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
+ auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la
+diff -ur audit-2.4.3.orig/bindings/python/python3/Makefile.am audit-2.4.3/bindings/python/python3/Makefile.am
+--- audit-2.4.3.orig/bindings/python/python3/Makefile.am	2015-07-22 23:35:24.315424091 +0800
+++ audit-2.4.3/bindings/python/python3/Makefile.am	2015-07-22 23:37:30.395400641 +0800
+@@ -28,5 +28,6 @@
+ 
+ auparse_la_SOURCES = $(top_srcdir)/bindings/python/auparse_python.c
+ auparse_la_CPPFLAGS = -I$(top_srcdir)/auparse $(AM_CPPFLAGS)
+-auparse_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
+auparse_la_CFLAGS = -shared
+auparse_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
+ auparse_la_LIBADD = ${top_builddir}/auparse/libauparse.la ${top_builddir}/lib/libaudit.la
+diff -ur audit-2.4.3.orig/bindings/swig/python/Makefile.am audit-2.4.3/bindings/swig/python/Makefile.am
+--- audit-2.4.3.orig/bindings/swig/python/Makefile.am	2015-07-22 23:35:24.316424083 +0800
+++ audit-2.4.3/bindings/swig/python/Makefile.am	2015-07-22 23:35:53.244189263 +0800
+@@ -28,7 +28,7 @@
+ pyexec_LTLIBRARIES = _audit.la
+ pyexec_SOLIBRARIES = _audit.so
+ _audit_la_CFLAGS = -shared
+-_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
+ _audit_la_HEADERS: $(top_builddir)/config.h 
+ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudit.la
+ _audit_la_LIBADD = $(top_builddir)/lib/libaudit.la
+diff -ur audit-2.4.3.orig/bindings/swig/python3/Makefile.am audit-2.4.3/bindings/swig/python3/Makefile.am
+--- audit-2.4.3.orig/bindings/swig/python3/Makefile.am	2015-07-22 23:35:24.316424083 +0800
+++ audit-2.4.3/bindings/swig/python3/Makefile.am	2015-07-22 23:36:27.833908482 +0800
+@@ -29,7 +29,7 @@
+ py3exec_LTLIBRARIES = _audit.la
+ py3exec_SOLIBRARIES = _audit.so
+ _audit_la_CFLAGS = -shared
+-_audit_la_LDFLAGS = -module -avoid-version -Wl,-z,relro
+_audit_la_LDFLAGS = -module -avoid-version -shared -Wl,-z,relro
+ _audit_la_HEADERS: $(top_builddir)/config.h 
+ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudit.la
+ _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la
--- a/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
+++ b/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/roxterm/roxterm-2.9.3-r1.ebuild,v 1.1 2015/07/27 18:47:31 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="A terminal emulator designed to integrate with the ROX environment"
+HOMEPAGE="http://roxterm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/roxterm/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.28
+	x11-libs/gtk+:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/vte:2.90"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	dev-python/lockfile
+	virtual/pkgconfig
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	nls? ( app-text/po4a sys-devel/gettext )"
+
+src_configure() {
+	local myconf=(
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		--prefix=/usr
+		--docdir="/usr/share/doc/${PF}"
+		--destdir="${D}"
+	)
+
+	use nls || myconf+=( --disable-gettext --disable-po4a --disable-translations )
+	./mscript.py configure "${myconf[@]}"
+}
+
+src_compile() {
+	./mscript.py build
+}
+
+src_install() {
+	./mscript.py install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@ -1,2 +1,2 @@
-DIST PLWM-2.7rc1.tar.gz 343570 SHA256 789fbd6229ad63ee9b2d939e27d049282dca45315d8e22debad56636a3b0a305
+DIST PLWM-2.7rc1.tar.gz 343570 SHA256 789fbd6229ad63ee9b2d939e27d049282dca45315d8e22debad56636a3b0a305 SHA512 4716677c86cf6b31ba8ea6c4e8fad729d9cf7d9c09b7d56ba6686173793c5b248865f0af281561a2df161433ea0fb2f2ca050dfb3b6c9fedbe41ff0ad0c07f7e WHIRLPOOL c1e678b4f15701c644e3f609c9b53100fe376a09f96454094fddba83c7a1f5c167c4746962e4996586568d110dfb3c4232e0bcaf33d09492946454b2e400d5eb
 DIST plwm-2.5.tar.gz 127248 SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d75812282b4bb548aedd14de
--- a/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
+++ b/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.7_rc1-r1.ebuild,v 1.1 2015/07/27 18:38:45 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_P=PLWM-${PV/_}
+
+DESCRIPTION="Python classes for, and an implementation of, a window manager"
+HOMEPAGE="http://plwm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/plwm/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/python-xlib-0.14[${PYTHON_USEDEP}]"
+DEPEND="sys-apps/texinfo"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pep0263.patch
+)
+
+python_compile_all() {
+	emake -C "${S}"/doc
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_newscript examples/examplewm.py plwm
+	python_doscript utils/*.py
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doinfo doc/*.info
+
+	dodoc ONEWS
+	dodoc -r examples
+	docinto utils
+	dodoc utils/ChangeLog
+}
				`@ -0,0 +1 @@`
				`DIST flask-socketio-0.6.0.tar.gz 6804 SHA256 5b004bc9a74421ec3983f5167a7cab70853b132a9c9c09d808c07f96bbf6ecd9 SHA512 3093fb659e8fe86a866bf9183401995a6615b3dfc8687549fa5845747935b6cd6bfc7bb56c969489f47fdb1a5420d744817b6a7dce636ab653ef62a08d353b1e WHIRLPOOL 1ff182a51ac24a61e02a6bf46612932bfdb4121737e27c34e324c859e9fe43a6db408fa162d0ff3b3952e8cb9bfa1e9d0f7b9e57149bce8af461fe5f4e829356`
				`@ -0,0 +1 @@`
				`DIST socketio-client-0.5.6.tar.gz 12069 SHA256 540d8ab209154d1d9cdb97c170c589a14f7d7f17e19c14e2f59f0307e6175485 SHA512 2ab316823cce0201b0c3a55b04a04fa39fe97f990b879fd5b45ccf6fa2ee6412d8c08d9892120f9a98fcf438e7e6302cf319a4df6cda061b90e1d802580563b9 WHIRLPOOL 6ba7f776ab0af9ae5efb0aca3d908daa018a83dd69e0a490efcd03c912c1c402d5c9a1381804df8cce333566182c76b321c4dd6bf14c948ede984aa752152dab`