Sync with portage [Mon Nov 30 23:40:05 MSK 2015].

9 years ago · 306fd6f5c3
parent 877857356c
commit 306fd6f5c3
63 changed files with 1446 additions and 374 deletions
--- a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 RESTRICT="test"

--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -12,5 +12,6 @@ DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea8
 DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
 DIST xen-gentoo-patches-5.tar.xz 23664 SHA256 41e23ec6fb5a4ef5a1f8746de0e33579de2c725368afed6bd2b7506df5e8c2b5 SHA512 8370cef1aa06585e8fa8f8c6eb7f29375ac6f5a240c859ebb6982d1c1ec159c9c331c861f39838f53093cdceca24ee1b0d98c1c92874dd4113e73eb884842eac WHIRLPOOL 4b65283220b66555a69b65331d3dcb8b8353fef584eb723c2a703712bc6eac57b70f500eeeffc511e75d3ab5d3a1eac8aac83133baf4c90ab498b1843764eb9f
 DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
+DIST xen-security-patches-0.tar.gz 1034 SHA256 283dfdf73735d1ce45db7d5b9880fec378317ebda097423b36d61aa1bf2146a8 SHA512 c15374546ddab803f1b1a2bc961f8d8b0ec04c141036f6a0c6a4d60129e23ace2d88ba6b292d6382463fa80d8bf8dbdfd788b325b1baa8a9aa5df63be26f8ed4 WHIRLPOOL 08fe26578f796a97e486e178a1b7b8e515e1d9797bdb868b487eabc95fa4f2063e5d08b554689fdb0392cc85643aaa22a93df197fd68729d4581c127df84fa5a
 DIST xen-security-patches-6.tar.xz 24780 SHA256 b41422583e5f7b4c85b82d89ab66f3e0fa8de8fdb2ae42aa3da40822e9507ef5 SHA512 c58831eb5e26a78a3072623b83bad125ddd4cd67c0075a708be81a7f50ee936cd2e5832a9b88129e11ec81ebafc9cfbc339fb8296d6f4b44c04630b349c4a621 WHIRLPOOL edecaefef0b6dd1a10c479362362640d9bd7a43623085c1f20b1171c65746220d7fdfd0e20892f60ea7d2f6052389da2a1d3c0179a88d7c4d52b3aa33cbef05e
 DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
--- a/app-emulation/xen-tools/xen-tools-4.5.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.5.2-r1.ebuild
@ -0,0 +1,466 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=
+	SECURITY_VER=7
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.7.5
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}
+	https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-0.tar.gz"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	hvm? ( media-libs/libsdl )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? ( x11-libs/pixman )
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-traditional patches
+		mv "${WORKDIR}"/xsa162-qemut.patch \
+			"${WORKDIR}"/patches-security/qemut/ || die
+		XEN_SECURITY_QEMUT="xsa162-qemut.patch"
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		mv "${WORKDIR}"/xsa162-qemuu.patch \
+                        "${WORKDIR}"/patches-security/qemuu/ || die
+		XEN_SECURITY_QEMUU="xsa162-qemuu.patch"
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patch set"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	# Don't bother with qemu, only needed for fully virtualised guests
+	if ! use qemu; then
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
--- a/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
@ -0,0 +1,476 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV/_/-}
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+if [[ $PV == *9999 ]]; then
+	KEYWORDS=""
+	REPO="xen-unstable.hg"
+	EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
+	S="${WORKDIR}/${REPO}"
+	live_eclass="mercurial"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 -x86"
+	UPSTREAM_VER=0
+	SECURITY_VER=7
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=4
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=1
+
+	SEABIOS_VER=1.8.2
+	OVMF_PV=20150629
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+
+DESCRIPTION="Xend daemon and tools"
+HOMEPAGE="http://xen.org/"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	qemu? ( !system-qemu )"
+
+COMMON_DEPEND="
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
+	ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	dev-python/markdown[${PYTHON_USEDEP}]
+	doc? (
+		app-doc/doxygen
+		dev-tex/latex2html[png,gif]
+		media-gfx/graphviz
+		dev-tex/xcolor
+		media-gfx/transfig
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+		dev-tex/latexmk
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-latexrecommended
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)
+	virtual/udev"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="usr/lib/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if has_version dev-libs/libgcrypt:0; then
+		export "CONFIG_GCRYPT=y"
+	fi
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patcheset"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+		einfo "Try to apply Xen Security patcheset"
+		source "${WORKDIR}"/patches-security/${PV}.conf
+		# apply main xen patches
+		for i in ${XEN_SECURITY_MAIN}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-traditional patches
+		mv "${WORKDIR}"/xsa162-qemut.patch \
+			"${WORKDIR}"/patches-security/qemut/ || die
+		XEN_SECURITY_QEMUT="xsa162-qemut.patch"
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-xen/upstream patches
+		mv "${WORKDIR}"/xsa162-qemuu.patch \
+			"${WORKDIR}"/patches-security/qemuu/ || die
+		XEN_SECURITY_QEMUU="xsa162-qemuu.patch"
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patcheset"
+		source "${FILESDIR}"/gentoo-patches.conf
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if [[ -n ${OVMF_VER} ]] && use ovmf; then
+		einfo "Try to apply Ovmf patcheset"
+		pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-ovmf
+		popd > /dev/null
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# use /var instead of /var/lib, consistat with previous ebuild
+	sed -i -e   "/XEN_LOCK_DIR=/s/\$localstatedir/\/var/g" \
+		m4/paths.m4 configure tools/configure || die
+	# use /run instead of /var/run
+	sed -i -e   "/XEN_RUN_DIR=/s/\$localstatedir//g" \
+		m4/paths.m4 configure tools/configure || die
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_with system-qemu) \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		"
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use qemu || myconf+=" --with-system-qemu"
+	use amd64 && myconf+=" --enable-qemu-traditional"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	unset LDFLAGS
+	unset CFLAGS
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	use doc && emake -C docs txt html
+	emake -C docs man-pages
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+
+		dohtml -r docs/
+		docinto pdf
+		dodoc ${DOCS[@]}
+		[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	rm -rf "${D}"/usr/share/doc/xen/
+	doman docs/man?/*
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Temp QA workaround
+	dodir "$(get_udevdir)"
+	mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
+	rm -rf "${D}"/etc/udev
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	# TODO: we need to have the current Python slot here.
+	if ! has_version "dev-lang/python[ncurses]"; then
+		echo
+		ewarn "NB: Your dev-lang/python is built without USE=ncurses."
+		ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
+	fi
+
+	if has_version "sys-apps/iproute2[minimal]"; then
+		echo
+		ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
+		ewarn "will not work until you rebuild iproute2 without USE=minimal."
+	fi
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper.  File bugs of any issues that arise"
+	fi
+
+	if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
+		echo
+		elog "xensv is broken upstream (Gentoo bug #142011)."
+		elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
+	fi
+}
--- a/dev-go/godep/Manifest
+++ b/dev-go/godep/Manifest
@ -1,2 +1 @@
-DIST godep-0_pre20150807.tar.gz 46281 SHA256 f3fec4523c75be20663aa9a4f11cda60a04d86d0d0d48ca3ce2330bf35f37fce SHA512 0969692442a63e99f3f16b7d29e85ace12378b536d31dc8f48bd99d6dd4cd45d025d427a21201d897bedf680c5157a6fdd68fe6410f3a9545599558436ce5cfe WHIRLPOOL ef9c7d13df8ac5dcb7ab9ee7766bb95120edfc87c60d336433b5a684af8d8c041ba6c7ec48dceb1d3f3ac9baff7024d5c1e471a41ffe31cc4c47f00c1443044c
 DIST godep-29.tar.gz 51852 SHA256 ca896c220f2995a50a5d9e63df929fa393c3cd1de9722210b5ef3684981bed2a SHA512 37fcfdbbba62cc942b077551953f45fda495b4db1ee5bafec69e4b3cc63c612785d3e97e8ff073825a532a74889c40b34e99cd592285ad255f64ccd3f8b76eff WHIRLPOOL 39f31d7562e3d8b3748d8958e1105578bbd8d799008d15aa6145eb71e4720985e7e71e0d927b32ba4e20195e2257b11a34748c7652454d1fae2d2df662beb146
--- a/dev-go/godep/godep-0_pre20150807.ebuild
+++ b/dev-go/godep/godep-0_pre20150807.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 else
 	KEYWORDS="~amd64"
-	EGIT_COMMIT=9805c4da6f
+	EGIT_COMMIT=v${PV}
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
@ -23,14 +23,7 @@ IUSE=""
 DEPEND=""
 RDEPEND=""

-src_prepare() {
-	# disable broken tests
-	sed -e 's:TestSave(:_\0:' \
-		-i src/${EGO_PN}/save_test.go || die
-	sed -e 's:TestUpdate(:_\0:' \
-		-i src/${EGO_PN}/update_test.go || die
-}
-
 src_install() {
 	dobin godep
+dodoc src/${EGO_PN}/*.md
 }
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@ -35,6 +35,8 @@ python_prepare_all() {
 		-e '/tests_require/d' \
 		-i setup.py || die

+	EPATCH_OPTS="--binary"
+
 	distutils-r1_python_prepare_all
 }

--- a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
+++ b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
@ -1,32 +1,32 @@
-# HG changeset patch
-# User Daniel <kingdread@gmx.de>
-# Date 1448482419 -3600
-# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d
-# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac
-Fix tests on PyPy 2
-
-Tests fail because of the extra "u" prefix in the error message
-
-diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py
--- a/src/cssutils/tests/test_profiles.py
-+++ b/src/cssutils/tests/test_profiles.py
-@@ -2,6 +2,7 @@
- __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'
- 
- import sys
-+import platform
- import basetest
- import cssutils
- 
-@@ -124,6 +125,11 @@
-             expmsg = u"invalid literal for int(): x" 
-         elif sys.platform.startswith('java'):
-             expmsg = u"invalid literal for int() with base 10: x"
-+        # PyPy adds the u prefix, but only in versions lower than Python 3
-+        elif (platform.python_implementation() == "PyPy" and
-+              sys.version_info < (3, 0)):
-+            expmsg = u"invalid literal for int() with base 10: u'x'"
-+
-             
-         self.assertRaisesMsg(Exception, expmsg, 
-                              cssutils.profile.validate, u'-test-funcval', u'x')
+# HG changeset patch
+# User Daniel <kingdread@gmx.de>
+# Date 1448482419 -3600
+# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d
+# Parent  3a01bd18118a6466ad93aa23caaa4164528b59ac
+Fix tests on PyPy 2
+
+Tests fail because of the extra "u" prefix in the error message
+
+diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py
+--- a/src/cssutils/tests/test_profiles.py
+++ b/src/cssutils/tests/test_profiles.py
+@@ -2,6 +2,7 @@
+ __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'
+ 
+ import sys
+import platform
+ import basetest
+ import cssutils
+ 
+@@ -124,6 +125,11 @@
+             expmsg = u"invalid literal for int(): x" 
+         elif sys.platform.startswith('java'):
+             expmsg = u"invalid literal for int() with base 10: x"
+        # PyPy adds the u prefix, but only in versions lower than Python 3
+        elif (platform.python_implementation() == "PyPy" and
+              sys.version_info < (3, 0)):
+            expmsg = u"invalid literal for int() with base 10: u'x'"
+
+             
+         self.assertRaisesMsg(Exception, expmsg, 
+                              cssutils.profile.validate, u'-test-funcval', u'x')
--- a/dev-ruby/metasploit-payloads/Manifest
+++ b/dev-ruby/metasploit-payloads/Manifest
@ -1,3 +1,4 @@
 DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
 DIST metasploit-payloads-1.0.16.gem 11805696 SHA256 e127930c2b6cf09c91f2a2d7ef2a215aae2dee00172606c6b8644886b932301f SHA512 27f51db437f49d5685007e8a8762123890e6cce46b7465b2db3c070298e23bc4c440583c37da59b841a91deb100d47aa86db2d634f07ed212fbba11134c3fe47 WHIRLPOOL de81c9bbc1350621c8d3711fe29056a9116b7ffc63205f336d3efe22655777264c86790aec95d26af6858e516c0a667e368c021713ac87d8d20ff08b65e2bfd2
+DIST metasploit-payloads-1.0.17.gem 11816448 SHA256 a7dbdbe04a0af1e4ff709ddd4d5eaef71ba9b11cdaafa7f599d6f1f6c9990740 SHA512 1158bad67ffcaa9e1664cd074e5a2db7a342a20faf687eb069ef0737e55c7b84ebe7cc3ed30fe0d6b113a039ecad0ba1102100d5d3e2cdce63dfbc6bb0277d93 WHIRLPOOL 5012027a4a8956a4c009798066d1166b149368715cb55259c465578df37cea53491b89ada67e452768252afd7ac48f275aafb2237a2f53e9093fd9a958314c7c
 DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.17.ebuild
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.17.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
+
+LICENSE="BSD"
+
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT="test strip"
+
+QA_PREBUILT="
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	"
+
+src_install() {
+	ruby-ng_src_install
+	#tell revdep-rebuild to ignore binaries meant for the target
+	dodir /etc/revdep-rebuild
+	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
+		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
+		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
+	EOF
+}
--- a/games-emulation/sdlmame/sdlmame-0.167.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.167.ebuild
@ -181,7 +181,7 @@ src_install() {
 			"${T}/mame.ini" || die
 	done
 	# -- Directories
-	for f in {cfg,nvram,memcard,input,state,snapshot,diff,commit} ; do
+	for f in {cfg,nvram,memcard,input,state,snapshot,diff,comment} ; do
 		sed -i \
 			-e "s:\(${f}_directory\)[ \t]*\(.*\):\1 \t\t\$HOME/.${PN}/\2:" \
 			"${T}/mame.ini" || die
@ -203,8 +203,8 @@ src_install() {

 	dodoc docs/{config,mame,newvideo}.txt
 	keepdir \
-		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \
-		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats}
+		"${GAMES_DATADIR}/${PN}"/{ctrlr,cheat,roms,samples,artwork,crosshair} \
+		"${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheat}

 	if use tools ; then
 		for f in castool chdman floptool imgtool jedutil ldresample ldverify romcmp testkeys ; do
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@ -48,6 +48,10 @@ RDEPEND="media-libs/libsdl2[opengl,video]
 DEPEND="${DEPEND}
 	virtual/pkgconfig"

+src_unpack() {
+	git-r3_src_unpack
+}
+
 src_prepare() {
 	append-cxxflags -std=c++11 -Isrc
 	epatch "${FILESDIR}"/${P}-gentoo.patch
--- a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
+++ b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
@ -0,0 +1,26 @@
+From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Thu, 26 Nov 2015 15:36:26 +0100
+Subject: [PATCH] Explicitly include CheckIncludeFiles.
+
+This fixes the build with CMake 3.4.0. We were calling check_include_files()
+and implicitly relying on CheckIncludeFiles being included.
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9be8db..b74b44d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -21,6 +21,7 @@ if(STRICT_BUILD)
+                   -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
+ endif(STRICT_BUILD)
+ 
+include(CheckIncludeFiles)
+ check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
+ 
+ if(NOT HAVE_DVB)
+-- 
+2.4.10
+
--- a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
@ -28,7 +28,10 @@ RDEPEND="${DEPEND}"

 DOCS=( Changelog NOTES )

-PATCHES=( "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-gcc4.7.patch"
+	"${FILESDIR}/${PN}-1.3.1-cmake34.patch"
+)

 src_configure() {
 	local mycmakeargs=(
--- a/media-video/kaffeine/kaffeine-1.3.1.ebuild
+++ b/media-video/kaffeine/kaffeine-1.3.1.ebuild
@ -29,7 +29,7 @@ RDEPEND="${DEPEND}"

 DOCS=( Changelog NOTES )

-PATCHES=( )
+PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )

 src_configure() {
 	local mycmakeargs=(
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 30 Nov 2015 13:58:06 +0000
+Mon, 30 Nov 2015 20:13:42 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 30 Nov 2015 13:58:06 +0000
+Mon, 30 Nov 2015 20:13:42 +0000
--- a/metadata/md5-cache/app-admin/syslog-ng-3.7.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.7.2
@ -4,11 +4,11 @@ DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=5
 HOMEPAGE=http://www.balabit.com/network-security/syslog-ng
 IUSE=amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.8.3 ) geoip? ( >=dev-libs/geoip-1.5.0 ) json? ( >=dev-libs/json-c-0.9 ) python? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) redis? ( dev-libs/hiredis ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1 ) systemd? ( sys-apps/systemd ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) dev-libs/libpcre !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.7.2/syslog-ng-3.7.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f20548a2f7b0128068388cd2ec26708a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	63d890c175bcc4604e8327cef1dec948	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=41735d550b78a96544b3aec4c5580fc8
+_md5_=15d1651d1566707138240cc7e2fb56c6
--- a/metadata/md5-cache/app-emulation/xen-tools-4.5.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.5.2-r1
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) hvm? ( media-libs/libsdl ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ovmf? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 -x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.5.2/xen-4.5.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.5.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.7.5.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20150629.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-1.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-7.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-4.tar.xz https://dev.gentoo.org/~idella4/distfiles/xen-security-patches-0.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	f20548a2f7b0128068388cd2ec26708a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	eecf1a199b07109ebdf640d647bd145a	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5
+_md5_=9e181da0a3a2c8bb1005ccddfddf9d14
--- a/metadata/md5-cache/app-emulation/xen-tools-4.6.0-r3
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.6.0-r3
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] api? ( dev-libs/libxml2 net-misc/curl ) pygrub? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ovmf? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/graphviz dev-tex/xcolor media-gfx/transfig dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 ) virtual/pkgconfig
+DESCRIPTION=Xend daemon and tools
+EAPI=5
+HOMEPAGE=http://xen.org/
+IUSE=api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 -x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib sys-apps/iproute2 net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) virtual/udev
+REQUIRED_USE=hvm? ( || ( qemu system-qemu ) ) python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) qemu? ( !system-qemu )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bits.xensource.com/oss-xen/release/4.6.0/xen-4.6.0.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.8.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.8.2.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20150629.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-1.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.6.0-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-security-patches-7.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-4.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	f20548a2f7b0128068388cd2ec26708a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	eecf1a199b07109ebdf640d647bd145a	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	udev	37ef89be271b9ae8aa64be024ddb39b5
+_md5_=8d124c7bd7656b58e4ca58e75112489b
--- a/metadata/md5-cache/dev-go/godep-0_pre20150807
+++ b/metadata/md5-cache/dev-go/godep-0_pre20150807
@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4.2:=
-DESCRIPTION=dependency tool for go
-EAPI=5
-HOMEPAGE=https://github.com/tools/godep
-KEYWORDS=~amd64
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/tools/godep/archive/9805c4da6f.tar.gz -> godep-0_pre20150807.tar.gz
-_eclasses_=golang-base	59e300a2d8836a6e8d508276da0d570f	golang-build	1b49258a68ba3972a575490adf3b7b4c	golang-vcs-snapshot	b10a39b036bc9a2dbefc6e168689b5fd
-_md5_=b5ac49a5d47b6c01b24a561272b05007
--- a/metadata/md5-cache/dev-go/godep-9999
+++ b/metadata/md5-cache/dev-go/godep-9999
@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=>=dev-lang/go-1.4.2:=
+DESCRIPTION=dependency tool for go
+EAPI=5
+HOMEPAGE=https://github.com/tools/godep
+LICENSE=BSD
+SLOT=0
+_eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	golang-base	59e300a2d8836a6e8d508276da0d570f	golang-build	1b49258a68ba3972a575490adf3b7b4c	golang-vcs	6625d7992916e5a3bed86489f4b9a73d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ec10db13e3107af10716d7f1c78b3bdb
--- a/metadata/md5-cache/dev-python/cssutils-1.0.1
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.1
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	f20548a2f7b0128068388cd2ec26708a	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0aa5a9a80ab151c32e805ec894763c39
+_md5_=4c3dd5fbc704928281fdcc028ac9ffb8
--- a/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.17
+++ b/metadata/md5-cache/dev-ruby/metasploit-payloads-1.0.17
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Compiled binaries for Metasploit's Meterpreter
+EAPI=5
+HOMEPAGE=https://rubygems.org/gems/metasploit-payloads
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RESTRICT=test strip
+SLOT=1.0.17
+SRC_URI=mirror://rubygems/metasploit-payloads-1.0.17.gem
+_eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4f0e404cc7e86bee4e02614ce33ede59
--- a/metadata/md5-cache/games-emulation/sdlmame-0.167
+++ b/metadata/md5-cache/games-emulation/sdlmame-0.167
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( arcade mess ) debug? ( X )
 SLOT=0
 SRC_URI=https://github.com/mamedev/mame/releases/download/mame0167/mame0167s.zip -> mame-0.167.zip
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	f20548a2f7b0128068388cd2ec26708a	games	4dae170e58f773c484e07d18ef441804	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	63d890c175bcc4604e8327cef1dec948	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=16b2d90bcc4e01ed78e9a310ba138694
+_md5_=c30f47bf18e97f876376c37d7cde1e45
--- a/metadata/md5-cache/games-puzzle/numptyphysics-9999
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-9999
@ -9,4 +9,4 @@ RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/s
 SLOT=0
 SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	f20548a2f7b0128068388cd2ec26708a	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	games	4dae170e58f773c484e07d18ef441804	git-r3	e6443022d06c4de81a14e017bdfcc306	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a9d33dd7d9e1543f65c5b78efa678c5f
+_md5_=e990a6a858880de54a0c5d06938f75ba
--- a/metadata/md5-cache/media-video/kaffeine-1.2.2-r1
+++ b/metadata/md5-cache/media-video/kaffeine-1.2.2-r1
@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXScrnSaver dev-qt/qtsql:4[sqlite] >=media-libs/xine-lib-1.1.
 SLOT=4
 SRC_URI=mirror://sourceforge/kaffeine/kaffeine-1.2.2.tar.gz
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	f20548a2f7b0128068388cd2ec26708a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	kde4-base	854fb923fd5f0e11760f814874246306	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	31995099f3454bb5fc3e8b5cdd3af7a8	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cb5d00f502d6fbbb2d7c171eb39f520f
+_md5_=aa473084b7cdd06573da86f1380159af
--- a/metadata/md5-cache/media-video/kaffeine-1.3.1
+++ b/metadata/md5-cache/media-video/kaffeine-1.3.1
@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXScrnSaver dev-qt/qtsql:4[sqlite] >=media-video/vlc-1.2[X] x
 SLOT=4
 SRC_URI=mirror://sourceforge/kaffeine/kaffeine-1.3.1.tar.gz
 _eclasses_=cmake-utils	f16fa5681153277df51f001deaf17ff8	eutils	f20548a2f7b0128068388cd2ec26708a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	968e31c6fcd13eb2eaf6852e88dfdd36	kde4-base	854fb923fd5f0e11760f814874246306	kde4-functions	ff0ade3e22b20c6dc894347fad047336	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	31995099f3454bb5fc3e8b5cdd3af7a8	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=06e5e21c5d403c177f715ee35760543c
+_md5_=22f7c91314ba09ffe9292a5f59adaee2
--- a/metadata/md5-cache/net-analyzer/metasploit-4.11.4_p2015090201-r2
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.11.4_p2015090201-r2
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/jsobfu-0.2*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] =dev-ruby/metasploit_data_models-1.2.5[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.9[ruby_targets_ruby21] =dev-ruby/metasploit-credential-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.6[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.9[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/jsobfu-0.2*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] =dev-ruby/metasploit_data_models-1.2.5[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.9[ruby_targets_ruby21] =dev-ruby/metasploit-credential-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.6[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.9[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-DESCRIPTION=Advanced open-source framework for developing, testing, and using vulnerability exploit code
+DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/jsobfu:0.2.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] =dev-ruby/metasploit_data_models-1.2.5[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.9[ruby_targets_ruby21] =dev-ruby/metasploit-credential-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.6[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.9[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/jsobfu:0.2.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] =dev-ruby/metasploit_data_models-1.2.5[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.9[ruby_targets_ruby21] =dev-ruby/metasploit-credential-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.6[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.9[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DESCRIPTION=Advanced framework for developing, testing, and using vulnerability exploit code
 EAPI=5
 HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java oracle +pcap test test elibc_FreeBSD ruby_targets_ruby21
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/jsobfu-0.2*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] =dev-ruby/metasploit_data_models-1.2.5[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.9[ruby_targets_ruby21] =dev-ruby/metasploit-credential-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.6[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.9[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/jsobfu:0.2.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] =dev-ruby/metasploit_data_models-1.2.5[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.9[ruby_targets_ruby21] =dev-ruby/metasploit-credential-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.6[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.9[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=4.11
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.11.4-2015090201.tar.gz -> metasploit-4.11.4_p2015090201.tar.gz
 _eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6f9db524c1cc557858d6b3c03064ddac
+_md5_=2c7fbdd967b63e730d2380d9861f4d21
--- a/metadata/md5-cache/net-analyzer/metasploit-4.11.5_p2015110401-r1
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.11.5_p2015110401-r1
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] =dev-ruby/jsobfu-0.2*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.15[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] =dev-ruby/jsobfu-0.2*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.15[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
-DESCRIPTION=Advanced open-source framework for developing, testing, and using vulnerability exploit code
+DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.2.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.15[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.2.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.15[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+DESCRIPTION=Advanced framework for developing, testing, and using vulnerability exploit code
 EAPI=5
 HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java oracle +pcap test test elibc_FreeBSD ruby_targets_ruby21
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] =dev-ruby/jsobfu-0.2*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.15[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.2.1[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.15[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=4.11
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.11.5-2015110401.tar.gz -> metasploit-4.11.5_p2015110401.tar.gz
 _eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d223ce3699ddb1d619c91a4b51c0add3
+_md5_=c66d031fe2d5658e4603608335ae96d4
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] =dev-ruby/jsobfu-0.3*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.16[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] =dev-ruby/jsobfu-0.3*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.16[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Advanced open-source framework for developing, testing, and using vulnerability exploit code
+DEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.17[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) test? ( >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/database_cleaner[ruby_targets_ruby21] >=dev-ruby/rspec-2.12[ruby_targets_ruby21] dev-ruby/shoulda-matchers[ruby_targets_ruby21] dev-ruby/timecop[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.17[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Advanced framework for developing, testing, and using vulnerability exploit code
 EAPI=5
 HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java oracle +pcap test test elibc_FreeBSD ruby_targets_ruby21
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] =dev-ruby/jsobfu-0.3*[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.16[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
+RDEPEND=ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] >=dev-ruby/activesupport-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/actionpack-4.0.9:4.0[ruby_targets_ruby21] >=dev-ruby/activerecord-4.0.9:4.0[ruby_targets_ruby21] dev-ruby/bcrypt-ruby[ruby_targets_ruby21] dev-ruby/builder:3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] dev-ruby/filesize[ruby_targets_ruby21] dev-ruby/jsobfu:0.3.0[ruby_targets_ruby21] dev-ruby/json[ruby_targets_ruby21] dev-ruby/kissfft[ruby_targets_ruby21] dev-ruby/metasm:1.0.2[ruby_targets_ruby21] dev-ruby/metasploit_data_models:1.2.9[ruby_targets_ruby21] dev-ruby/meterpreter_bins:0.0.22[ruby_targets_ruby21] dev-ruby/metasploit-payloads:1.0.17[ruby_targets_ruby21] dev-ruby/metasploit-credential:1.0.1[ruby_targets_ruby21] >=dev-ruby/metasploit-concern-1.0.0:1.0[ruby_targets_ruby21] >=dev-ruby/metasploit-model-1.0.0:1.0[ruby_targets_ruby21] dev-ruby/msgpack[ruby_targets_ruby21] dev-ruby/nokogiri[ruby_targets_ruby21] dev-ruby/recog:2.0.14[ruby_targets_ruby21] =dev-ruby/rkelly-remix-0.0.6[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] >=dev-ruby/pg-0.11[ruby_targets_ruby21] dev-ruby/packetfu:1.1.11[ruby_targets_ruby21] >=dev-ruby/rubyzip-1.1[ruby_targets_ruby21] dev-ruby/rb-readline-r7[ruby_targets_ruby21] dev-ruby/robots[ruby_targets_ruby21] java? ( dev-ruby/rjb[ruby_targets_ruby21] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby21] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby21] dev-ruby/network_interface[ruby_targets_ruby21] ) development? ( dev-ruby/fivemat[ruby_targets_ruby21] dev-ruby/pry[ruby_targets_ruby21] dev-ruby/redcarpet[ruby_targets_ruby21] dev-ruby/yard[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby21] ) ) dev-db/postgresql[server] >=app-crypt/johntheripper-1.7.9-r1[-minimal] net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
 REQUIRED_USE=|| ( ruby_targets_ruby21 )
 RESTRICT=strip
 SLOT=9999
 _eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	git-r3	e6443022d06c4de81a14e017bdfcc306	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	3972ca401cf7dbb430df9995f5d8d580	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b4a7495d60fca14dfa4b1d09a6687c0
+_md5_=27bed5e604767c37c31555ef2fc70848
--- a/metadata/md5-cache/net-p2p/bittornado-0.3.18-r3
+++ b/metadata/md5-cache/net-p2p/bittornado-0.3.18-r3
@ -4,11 +4,11 @@ DESCRIPTION=TheShad0w's experimental BitTorrent client
 EAPI=5
 HOMEPAGE=http://www.bittornado.com/
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/pycrypto[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=http://download2.bittornado.com/download/BitTornado-0.3.18.tar.gz
 _eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	f20548a2f7b0128068388cd2ec26708a	multibuild	706332a8d833c077e1aa37faa1ebf162	multilib	3972ca401cf7dbb430df9995f5d8d580	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	ead0b4e7f0f35d7ae8b91da6e3822535	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a55f8363db88ce8f1a421ee102e91915
+_md5_=be4b291dec325481fd4904f2b9177b72
--- a/metadata/md5-cache/sci-chemistry/coot-0.8.2-r1
+++ b/metadata/md5-cache/sci-chemistry/coot-0.8.2-r1
@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=sci-libs/libccp4 sci-libs/clipper >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 sci-libs/fftw:2.1= sci-libs/mmdb:2 sci-libs/monomer-db sci-libs/ssm sci-chemistry/reduce sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng:0= media-libs/freeglut x11-libs/gtk+:2 x11-libs/goocanvas:0 x11-libs/gtkglext virtual/opengl dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-db/sqlite:3 dev-libs/boost:0=[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/glib:2 >=dev-libs/gmp-4.2.2-r2:0= dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=net-misc/curl-7.19.6 net-dns/libidn sys-libs/readline:0=
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/coot-0.8.2.tar.gz test? ( https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/data/greg-data.tar.gz -> coot-greg-data.tar.gz )
+SRC_URI=http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/coot-0.8.2.tar.gz test? ( https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/data/greg-data.tar.gz -> coot-0.8.2-greg-data.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	f20548a2f7b0128068388cd2ec26708a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	eecf1a199b07109ebdf640d647bd145a	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a7bb6b3dc1f1d22e73dc87ec4c7d9b93
+_md5_=ad0db31a4d61793836ec0a50f20ea9cb
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.45
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.45
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf
-DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
-EAPI=4
-HOMEPAGE=http://gtkwave.sourceforge.net/
-IUSE=doc examples fasttree fatlines judy lzma packed tcl
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 MIT
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.45.tar.gz
-_eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ee2fd5acbc60b81b25c7853c0194abfb
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.47
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.47
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf
-DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
-EAPI=4
-HOMEPAGE=http://gtkwave.sourceforge.net/
-IUSE=doc examples fasttree fatlines judy lzma packed tcl
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 MIT
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.47.tar.gz
-_eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=28380cb5eaceec3ba446e0faac9f717a
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.64
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.64
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf
-DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
-EAPI=4
-HOMEPAGE=http://gtkwave.sourceforge.net/
-IUSE=doc examples fasttree fatlines judy lzma packed tcl
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 MIT
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.64.tar.gz
-_eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fc1b56b684269700973d531591595887
--- a/metadata/md5-cache/sci-electronics/gtkwave-3.3.68
+++ b/metadata/md5-cache/sci-electronics/gtkwave-3.3.68
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils ) virtual/pkgconfig dev-util/gperf
 DESCRIPTION=A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files
-EAPI=4
+EAPI=5
 HOMEPAGE=http://gtkwave.sourceforge.net/
 IUSE=doc examples fasttree fatlines judy lzma packed tcl
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 MIT
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango sys-libs/zlib judy? ( dev-libs/judy ) tcl? ( dev-lang/tcl:0 dev-lang/tk:0 ) lzma? ( app-arch/xz-utils )
 SLOT=0
-SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.59.tar.gz
+SRC_URI=mirror://sourceforge/gtkwave/gtkwave-3.3.68.tar.gz
 _eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fc1b56b684269700973d531591595887
+_md5_=ff1ce77c64dd4a7ca1a5b53004563af2
--- a/metadata/md5-cache/sci-electronics/linsmith-0.99.30
+++ b/metadata/md5-cache/sci-electronics/linsmith-0.99.30
@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui 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=Smith charting program, mainly designed for educational use
+EAPI=5
+HOMEPAGE=http://www.jcoppens.com/soft/linsmith/index.en.php
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
+SLOT=0
+SRC_URI=mirror://sourceforge/linsmith/linsmith-0.99.30.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f20548a2f7b0128068388cd2ec26708a	libtool	b75230758539a7da029e24afdb693960	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=67061e855337030199d9650de99f5316
--- a/metadata/md5-cache/sys-apps/usbutils-008-r1
+++ b/metadata/md5-cache/sys-apps/usbutils-008-r1
@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=5
 HOMEPAGE=http://linux-usb.sourceforge.net/
 IUSE=python python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-008.tar.xz
 _eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	eecf1a199b07109ebdf640d647bd145a	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=bca12e16b558b87c8e20e4c6c64fdef2
+_md5_=5a233ca0ee0619191635512fe50d61a9
--- a/metadata/md5-cache/sys-kernel/git-sources-4.4_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.4_rc3
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4_rc3
+SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.4-rc3.xz mirror://kernel/linux/kernel/v4.x/linux-4.3.tar.xz
+_eclasses_=eutils	f20548a2f7b0128068388cd2ec26708a	kernel-2	a4c66611301c7fdf1c78202ab683fb1b	multilib	3972ca401cf7dbb430df9995f5d8d580	python-any-r1	63d890c175bcc4604e8327cef1dec948	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=0ea488757d8676d39e925bf8584dc22f
--- a/metadata/md5-cache/www-apps/trac-1.0.9
+++ b/metadata/md5-cache/www-apps/trac-1.0.9
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) test? ( dev-python/twill[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Trac is a minimalistic web-based project management, wiki and bug/issue tracking system
+EAPI=5
+HOMEPAGE=http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac
+IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test python_targets_python2_7 vhosts
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite ) python_targets_python2_7
+SLOT=0
+SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.9.tar.gz
+_eclasses_=distutils-r1	79bc5f4de403751e472e01fdfd98d587	eutils	f20548a2f7b0128068388cd2ec26708a	multilib	3972ca401cf7dbb430df9995f5d8d580	python-single-r1	eecf1a199b07109ebdf640d647bd145a	python-utils-r1	435d2b9a60ae5a1c3b65737c621716e2	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=f4ac50490dc498b2253859cfabbefaea
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Mon, 30 Nov 2015 13:58:06 +0000
+Mon, 30 Nov 2015 20:13:42 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Mon Nov 30 13:57:11 UTC 2015
+Mon Nov 30 20:12:48 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Mon, 30 Nov 2015 14:00:01 +0000
+Mon, 30 Nov 2015 20:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1448891701 Mon 30 Nov 2015 01:55:01 PM UTC
+1448914201 Mon 30 Nov 2015 08:10:01 PM UTC
--- a/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.4_p2015090201-r2.ebuild
@ -27,7 +27,7 @@ else
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
 fi

-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 IUSE="development +java oracle +pcap test"
@ -43,7 +43,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/bcrypt-ruby
 	dev-ruby/builder:3
 	dev-ruby/bundler
-	=dev-ruby/jsobfu-0.2*
+	dev-ruby/jsobfu:0.2.1
 	dev-ruby/json
 	dev-ruby/kissfft
 	=dev-ruby/metasploit_data_models-1.2.5
--- a/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.11.5_p2015110401-r1.ebuild
@ -27,7 +27,7 @@ else
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
 fi

-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 IUSE="development +java oracle +pcap test"
@ -44,7 +44,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/builder:3
 	dev-ruby/bundler
 	dev-ruby/filesize
-	=dev-ruby/jsobfu-0.2*
+	dev-ruby/jsobfu:0.2.1
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@ -27,7 +27,7 @@ else
 	SLOT="$(get_version_component_range 1).$(get_version_component_range 2)"
 fi

-DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
+DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 LICENSE="BSD"
 IUSE="development +java oracle +pcap test"
@ -44,13 +44,13 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/builder:3
 	dev-ruby/bundler
 	dev-ruby/filesize
-	=dev-ruby/jsobfu-0.3*
+	dev-ruby/jsobfu:0.3.0
 	dev-ruby/json
 	dev-ruby/kissfft
 	dev-ruby/metasm:1.0.2
 	dev-ruby/metasploit_data_models:1.2.9
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.16
+	dev-ruby/metasploit-payloads:1.0.17
 	dev-ruby/metasploit-credential:1.0.1
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0
--- a/net-p2p/bittornado/bittornado-0.3.18-r3.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.18-r3.ebuild
@ -20,7 +20,7 @@ SRC_URI="http://download2.bittornado.com/download/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"

-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""

 RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@ -1,2 +1,2 @@
+DIST coot-0.8.2-greg-data.tar.gz 8677037 SHA256 d936795853406f3c2a3dfd6f37a07a7df677e96b2d023d9302668aa49b7f06cb SHA512 28396a5fa64af61e8932b565c6593ed27c4708e6a59158d62c94005bea9fa8c46562b6caba97011209a40705e5ec6711b949138dd8a23bb954df2ab4dfa9bb33 WHIRLPOOL cb85234ece76314661bcfa424904224ac554c41fc63655857f3ba1bd2f0bf8e457c55dd1f42ffecffb9a8582ff759277b0fb9a40ca2393bf47b6a09fdd04ce1e
 DIST coot-0.8.2.tar.gz 15772937 SHA256 2f5961ded7f2cf06b887560afe964c239aba94f9c4bf8a2a80b3ca4fbc471eee SHA512 a323608df7b63f22eb2d1ac679fc047bba9fe23fe6366ae1d6ae29ca00a567aafb3d29840878e8c5123421037e26b6463f0bb845ef28dcbb4f3647cda2f74575 WHIRLPOOL d84d23aa49404dce63649bd6c5f8149e95ad5776ec4fa6ebdfcf44ebabef56c3a29376da7a1d5f8ee6f8013158a7f5c74f5bd74066036ca750bc3ff7de084791
-DIST coot-greg-data.tar.gz 8677037 SHA256 d936795853406f3c2a3dfd6f37a07a7df677e96b2d023d9302668aa49b7f06cb SHA512 28396a5fa64af61e8932b565c6593ed27c4708e6a59158d62c94005bea9fa8c46562b6caba97011209a40705e5ec6711b949138dd8a23bb954df2ab4dfa9bb33 WHIRLPOOL cb85234ece76314661bcfa424904224ac554c41fc63655857f3ba1bd2f0bf8e457c55dd1f42ffecffb9a8582ff759277b0fb9a40ca2393bf47b6a09fdd04ce1e
--- a/sci-chemistry/coot/coot-0.8.2-r1.ebuild
+++ b/sci-chemistry/coot/coot-0.8.2-r1.ebuild
@ -18,8 +18,9 @@ MY_P=${PN}-${MY_PV}

 DESCRIPTION="Crystallographic Object-Oriented Toolkit for model building, completion and validation"
 HOMEPAGE="https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/"
-SRC_URI="http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz
-	test? ( https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/data/greg-data.tar.gz -> ${PN}-greg-data.tar.gz )"
+SRC_URI="
+	http://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/source/releases/${MY_P}.tar.gz
+	test? ( https://www2.mrc-lmb.cam.ac.uk/Personal/pemsley/coot/data/greg-data.tar.gz -> ${P}-greg-data.tar.gz )"

 SLOT="0"
 LICENSE="GPL-3"
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@ -1,6 +1,3 @@
-DIST gtkwave-3.3.45.tar.gz 3809190 SHA256 aad2619b4100911d05af97a2046f6c311fe2f75fe036bd1946974dc2edc9a791 SHA512 7a78607aca4e33c6d00b0ba78b563966544b0a1674e3fa0eed4d1333dad53edc18ef15528d2913e00d4d6776eabb275116950da1a59d82b98c2d29f4c6d713cd WHIRLPOOL a41b992f987a4154c2d742ef3ac908865689b04f77e2eb2ca3284bb06d00b26f8b4a75e6bf3f1d3740f790586eb900581b049a43839557d45d78879a5967a697
-DIST gtkwave-3.3.47.tar.gz 3832052 SHA256 b39c018f668070a0fdd3906c73a9add4ccbffd3edbb926ed9b49fc5e3cf35f62 SHA512 61c0a3ce75ec6b14446ab17ca9c6f39d243443d941659f6fe734ae52d22d8b117151989c1944e611389b1a0c48b0ba6f96b85df130d6d7d118aa809c148270a7 WHIRLPOOL bceb4d2aba756c63ea6604f60cd56d5a94e689fe493b53ec40062fc5309d68a6c1680853ea64891a7ef2b8af5ac570a1b28b78cbdc34173cbf7a70e007f89d56
-DIST gtkwave-3.3.59.tar.gz 4083000 SHA256 caba829abdbc4a4df7cc932695aed87037d656f62cd5831b531d13453034a984 SHA512 5def8eef767b292bc1e09dc7b5a7151b6f492b6e5b744e1b8e563ac3731073721fdce180b85bbc2c8dd7ecaf757a9a67bd3a809c55e522befa74d5d74f815b3d WHIRLPOOL 0b2b4ee8cc6d59eb335c805535b40439bd8034b62b693c9ceb7f868fcee97ed7a3075b00eb9ab36cbe9b475c5134c0d75a022da8bd99e77db34e48d91a241cfc
-DIST gtkwave-3.3.64.tar.gz 4090345 SHA256 dae956b3e55dc9b5d2bafe11fcf9b8606870d76f0719202fd04b678160d37115 SHA512 34150741942d2b82a5f937cf12b1793e04aea0444acaf4a4ba1c61e5bb70727d5990438833ee4d25fef81362929d0607ebd7fddb8fd178f437cafdf9c09e989f WHIRLPOOL 137eb908d004a1305d12b96b06d589525f82d69172d87434bb06fd5a8ff05e7bfc0f0d0746e9470337c636d5ce16e410d78b8b01d923bf3a4ed1030d71c89373
 DIST gtkwave-3.3.65.tar.gz 4092871 SHA256 64eb091e70c83bf03df14e01d338151e888fb4099c4695c2e6e40ce27d249bd5 SHA512 5aba36c9b9ff6353115ce5660b3dd61fba96ef2bc420483e194ad7a0d97b6f0a4453db20188c12af1c333ecbeee43f7ebe5b4bd166864a003995687a497a14ff WHIRLPOOL e5aac94e9c65aa1bedffa3febac38402f51c4c84237f39d703a9f1860a981dae308109935add36f4f0881ce7c491f2aaac0b52c54bc85ca025c9518d901df344
 DIST gtkwave-3.3.66.tar.gz 4093766 SHA256 04ce0851ebcf7ce07506c6e34af878ebf0c5a09495035a71e881fe6ff2abb99e SHA512 6c91efcbd240efceb770882eb0d1ccf5195b40207714432882fdaf35108e05860a5b00b7e922f95f537b01be335e8b4026e3ba6dcf02e235ff3b20f2082e7b81 WHIRLPOOL 6d4927d9b9e19f9ca128d9339b0e5c0ceec3b4ca2644ad38c861ff6f1896a5ba9a2c4c28b367413da6d255d6799748e7dfef0222ff3d6b3a4aa041661dee9d74
+DIST gtkwave-3.3.68.tar.gz 4097204 SHA256 9846ced0601c32c87bfda236ccadc2c6435a76c3a799b0d17ed54a5d7391343e SHA512 bcdd6f7de6454aefec65a0056a4a6a9994566b19ba0dc13f49f38d7d2bc601421d68aa04ebcd285fcb446f6d4a0a55a169db366c0d9387a809a59d61c8c76cac WHIRLPOOL 742f2b6a1527ce3f6b58360d1bc3a6f2cd9607740fc7d32cfd858e4d77a542fd6f4dde463800c5305eaa12af548ae7bded050d1428338daf981cb1cdfd6c4448
--- a/sci-electronics/gtkwave/gtkwave-3.3.45.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.45.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare(){
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-}
-
-src_configure(){
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ANALOG_README.TXT SYSTEMVERILOG_README.TXT CHANGELOG.TXT
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-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/sci-electronics/gtkwave/gtkwave-3.3.47.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.47.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare(){
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-}
-
-src_configure(){
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ANALOG_README.TXT ChangeLog README SYSTEMVERILOG_README.TXT
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-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/sci-electronics/gtkwave/gtkwave-3.3.64.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.64.ebuild
@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils fdo-mime toolchain-funcs
-
-DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
-HOMEPAGE="http://gtkwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fasttree fatlines judy lzma packed tcl"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	sys-libs/zlib
-	judy? ( dev-libs/judy )
-	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
-	lzma? ( app-arch/xz-utils )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gperf"
-
-AT_M4DIR="${S}"
-
-src_prepare(){
-	# do not install doc and examples by default
-	sed -i -e 's/doc examples//' Makefile.in || die
-}
-
-src_configure(){
-	econf --disable-local-libz \
-		--disable-local-libbz2 \
-		--disable-mime-update \
-		--enable-largefile \
-		$(use_enable packed struct-pack) \
-		$(use_enable fatlines) \
-		$(use_enable tcl) \
-		$(use_enable lzma xz) \
-		$(use_enable fasttree) \
-		$(use_enable judy)
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins "doc/${PN}.odt"
-	fi
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-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/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
+++ b/sci-electronics/gtkwave/gtkwave-3.3.68.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI="5"

 inherit eutils fdo-mime toolchain-funcs

--- a/sci-electronics/linsmith/Manifest
+++ b/sci-electronics/linsmith/Manifest
@ -1 +1,2 @@
 DIST linsmith-0.99.28.tar.gz 1132315 SHA256 22196edb6e4c72a45a3d0a794a0bb140ab5932a5e59a40e2e9ee143b53c4235d SHA512 0e8811b64703884dc44e0d8c6a6eeefbb3ba65d8af7573a87e1985e9061d3d947f5e35631dbca2444a9ef2600b523358d6b65089ae746312f9e3397a9dd99118 WHIRLPOOL 41416593eb0eb8913bbd1b9d4cc104830f18eb0835b5c262e8725f3a45162a012167d396205dfc362b9908ed35a7643540dc4fe055772c8806d7c02743746dcb
+DIST linsmith-0.99.30.tar.gz 1132438 SHA256 76739c0cdc13f193793842ea4ddd027a27143a6672994de485b9902c32a41aa3 SHA512 d1f6cd3895b7c217de49c214f8b86b1bb9ce97d540546f0004b7f320b7cf142652cf0ec51ce48cf32b89564bf408546bf10d5f4937544cf9e8a4d87d1db5bed5 WHIRLPOOL c79553bea2f35a4ed04ee028ca92c06856f13d1cb966242a1538e3719ea69330f531b1e7dcba7d6f38cdc29cedda987a2544545cea4aa1648393bcbbbeea0ac5
--- a/sci-electronics/linsmith/linsmith-0.99.30.ebuild
+++ b/sci-electronics/linsmith/linsmith-0.99.30.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Smith charting program, mainly designed for educational use"
+HOMEPAGE="http://www.jcoppens.com/soft/linsmith/index.en.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	dev-libs/libxml2:2
+	dev-libs/glib:2
+	dev-libs/atk
+	gnome-base/libgnome
+	gnome-base/libgnomecanvas
+	gnome-base/libgnomeui"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# This patch is to prevent make install copying
+	# the examples in /usr/share/linsmith
+	# Now they are cp to the correct location.
+	epatch \
+		"${FILESDIR}"/${PN}-datafiles.patch
+
+	# fix QA warnings about wrong categories in .desktop file
+	sed -i -e "s/Application;Engineering;/Education;Science;Electronics;/" \
+		-e "s/Encoding=/#Encoding=/" \
+		${PN}.desktop || die
+
+	# fix QA warnings about 'maintainer mode'
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto "/usr/share/${PN}"
+	doins datafiles/conv0809
+
+	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
+	doman doc/${PN}.1
+
+	domenu ${PN}.desktop
+	doicon ${PN}_icon.xpm
+
+	if use doc; then
+		insinto "/usr/share/doc/${PF}"
+		doins doc/manual.pdf
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins datafiles/*.circ datafiles/*.load || die
+	fi
+}
--- a/sys-apps/usbutils/usbutils-008-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-008-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@ -1,3 +1,4 @@
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST patch-4.4-rc1.xz 6387896 SHA256 3870efdb5dfdbcb17d5a233e8e9c69156609825a3fb344b8f0fcecb92646360d SHA512 8012aa366ae77ab9bc17d66d1912908f18624c5a7803e7acbbe0cf3fe8633517a6dc12affb47a2c90fbbfb9acd762be511b01abc16650d8c7ac526896210005f WHIRLPOOL fc8d501aceb8f9b9957e37109fafe05f666300368c60d73686ab0f1e87a21f5e8a605f23abd063b7cdf6df9ae33ccd079d2aea811444a4c5938180dcb161947d
 DIST patch-4.4-rc2.xz 6472332 SHA256 04a2fe6ce8711a01617e459d6908bfbd7715a0e4106fbd05372e12ba7ad03158 SHA512 c4690fa99a3e2f48de8093c3ce68605e79fdb12dde2483a5f147c43fefaa5002153f50006599a2f0b59a014265dcaf4bf16925bcea674b9a82f0ddac2cdc88ae WHIRLPOOL 163b4beed95a8eb1f0068c7c2fcfa4a294fd35072dd6b48aaebc079e8720ec9aabd6fc06edd32bbd79ab28d0ba943851aa5abafd8c5a564f40dcd9ee1665f485
+DIST patch-4.4-rc3.xz 6514956 SHA256 41b73ce54efdde419218de2ca2b1bcc2bc135b5e33ab870e28eb328fca962855 SHA512 08ac846d999c8997b24a85b316218dc27c0f4adb5ab38186668705e1ca06cb576e198c702eaaf97cdbfce4a6f69805765b63c16c97271dd702bab05708ac7897 WHIRLPOOL bf01ded5974cfa6d1d887ea558ccd8b0deae88f2d8836614d0579ca25afd6a7aec1c726ee5c01506b33835f3f5c0cea5125a452969def053fda810299704658e
--- a/sys-kernel/git-sources/git-sources-4.4_rc3.ebuild
+++ b/sys-kernel/git-sources/git-sources-4.4_rc3.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.3"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@ -1,3 +1,4 @@
 DIST Trac-1.0.4.tar.gz 3579886 SHA256 a1d564c5b612306856dd26851270b12fbba91bab1bc146b66d4cc248be1a172e SHA512 1186c3d36b7b8eae6595dcf5dfc30aed9302d46dae2019da8178a2656065fd5675683331474118f3da47f9ba75fd213ad1964bad29c7892423ab1fa7371a8131 WHIRLPOOL 2be04e6a683f88923b2f9b09fdee4b5de24779f399f32763674512f71f4f03e72b74592e0dc49e6693dc1c6c1c4ebdfb680eac72146b9fdb3735db50a5e8c9fb
 DIST Trac-1.0.5.tar.gz 3587954 SHA256 65b191f5eeb9590d2f8cd5d9e11155669947d2241d754ce55aa7e9eef65e5578 SHA512 445172bca990837492f79a11a0df18bb457e3930116a274213078d4bcd5dd44beded655b9f6ed2f93cb5b991530131a06628603879b56f2a390bf7d3822abed2 WHIRLPOOL 3fffaaead5ef61fd4655fc7f13bf9f3c00171249aa271a2d5f9312cd68df7031c51dd564bbe3b8ceed18dac0ac8045bed65c87f7c6e64963d9509ffd3c7f06ca
 DIST Trac-1.0.6.post2.tar.gz 3638718 SHA256 aefae1b4b6de37f6fb105e03d304a125cdbccbf632ba5ade15804c470f3aedcb SHA512 f8f6b086710a992d37e63bcc59f1cbc2b763cb36f8deacd9f459cccd860f0eb2f0bb41091914807ad93a607d1c3f7154a240322e61b1f89fbebd1624f57bf25b WHIRLPOOL 301926fece71c5d2fe04298fd9e4b9e260903c77dee2ecc60fd8e6c194284ed1475e41eef7a80c7387375db91e8d1239ee8e2bac0d410d1475da52d14edc4c77
+DIST Trac-1.0.9.tar.gz 3642845 SHA256 9ed3f0a2039c46132d10f35c211f9f6ee953339cc08492a41d1bf8741d6eebfa SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304 WHIRLPOOL 4005102b1109aac94728d22151c2192a38f9ab91af0227a24dff1a2e2097e67ceafa0cef0f307f1a1ddb1999c109d142bbb739107d4047dc296e6a8396a9427a
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9.ebuild
@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Trac is a minimalistic web-based project management, wiki and bug/issue tracking system"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.python.org/pypi/Trac"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/genshi[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
+	highlight? (
+		|| (
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/silvercity
+			app-text/pytextile
+			app-text/enscript
+		)
+	)
+	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
+	cgi? ( virtual/httpd-cgi )
+	fastcgi? ( virtual/httpd-fastcgi )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
+	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/twill[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}