Sync with portage [Sun Nov 15 16:28:19 MSK 2015].

9 years ago · 63af9821f2
parent 6e2564e4d8
commit 63af9821f2
130 changed files with 1651 additions and 1607 deletions
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,3 +1,4 @@
 DIST libvirt-1.2.18.tar.gz 29412554 SHA256 d5a5ff18af4cced21fed986d28fa0a21b782d256920326bf0ff1c7731eeb6ade SHA512 e89d494066ebec4de4c9a53089f015635b7b5ccf4a10ab9749883cc81f6f9607b18ca91a1bd01a9cdacb3a46de86223f0432fae3954106cb92dd275e5b4138c5 WHIRLPOOL dbbbd627ccb9be154bc680407898cd32dfdbc218a67f54560e6b0f0200cbc157a9aa05834de5d9d23e3b6da0625fd5943b4c8e38f8bb9a6ff920bc5820287bfc
 DIST libvirt-1.2.19.tar.gz 29644247 SHA256 282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e SHA512 2f3f26b90120a39861683f1b5af93ac661ab561e23514c71c2ebfb1ab88da99d25acee9a5d11bec35478e38b9105f3779bffb4d4649f16a91aeccdcaa61e4aa4 WHIRLPOOL 4262beb2248495746d32bc7b16c3eec69d9cba7d4fb3870fcd560bd4d222827cf90eb9cc3df647f3fe10467d1562e72138cbf871adc5f63d4788069e1b9740ac
 DIST libvirt-1.2.20.tar.gz 29725368 SHA256 df0b5d8a150863a86b98cf809a586c91b2d49af25b74a354049ea416b0b27d30 SHA512 2c7f7995d38d15453de99cc34e63db9c39c653fc24a4fd949207e62c0241f2a5ff3ab5505909ffae77f7a91d321396372188aa29124b8271f876d93546c44d07 WHIRLPOOL 553517c8eec3f601987d9a9205668a81ffcaf9081ee0d79de847ce1d2c9bcd9115471adf2022095143d440a07f7d48059cfd88094b7dda7046a784c93c449817
+DIST libvirt-1.2.21.tar.gz 29848954 SHA256 8d406582f5fe88d739d1d83e0ba7ac7f91f5a8da4be82162ab85631744d8925b SHA512 5c15d0ba5d75c13f735c6a60dfdbad007426f77e113f95894d520f7fc358fa4361d5cce7bb9a548a436f323b845f13b8940abbad568b8b146418430068bb970e WHIRLPOOL d53bbb07c85b3aa2d9b0f38ff2edd3cd0a2a5300627f3e2f0a82bc057303617cab9d6f1d8a9a771bd968b0496d38d3a39a0154f88bdca44dda359a65fdc2c650
--- a/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.20-r1.ebuild
@ -34,7 +34,7 @@ LICENSE="LGPL-2.1"
 IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
 	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
 	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
-	xen elibc_glibc"
+	xen"

 REQUIRED_USE="
 	firewalld? ( virt-network )
@ -114,8 +114,7 @@ RDEPEND="
 	udev? (
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+	)"

 DEPEND="${RDEPEND}
 	app-text/xhtml1
--- a/app-emulation/libvirt/libvirt-1.2.21.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.21.ebuild
@ -0,0 +1,380 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user autotools-utils linux-info systemd readme.gentoo
+
+BACKPORTS=""
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	# Versions with 4 numbers are stable updates:
+	if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+		SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.gz"
+	else
+		SRC_URI="http://libvirt.org/sources/${P}.tar.gz"
+	fi
+	SRC_URI+=" ${BACKPORTS:+
+		https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
+		https://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
+	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
+	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
+	xen"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	qemu? ( libvirtd )
+	uml? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/netcat6-1.0-r2
+	>=net-libs/gnutls-1.0.25
+	net-libs/libssh2
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	avahi? ( >=net-dns/avahi-0.6[dbus] )
+	caps? ( sys-libs/libcap-ng )
+	firewalld? ( net-firewall/firewalld )
+	fuse? ( >=sys-fs/fuse-2.8.6 )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
+	lxc? ( !systemd? ( sys-power/pm-utils ) )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	openvz? ( sys-kernel/openvz-sources:* )
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-0.13.0
+		dev-libs/yajl
+		!systemd? ( sys-power/pm-utils )
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	systemd? ( sys-apps/systemd )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		app-emulation/xen
+		app-emulation/xen-tools
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)"
+
+DEPEND="${RDEPEND}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup qemu 77
+	enewuser qemu 77 -1 -1 qemu kvm
+
+	# Some people used the masked ebuild which was not adding the qemu
+	# user to the kvm group originally. This results in VMs failing to
+	# start for some users. bug #430808
+	egetent group kvm | grep -q qemu
+	if [[ $? -ne 0 ]]; then
+		gpasswd -a qemu kvm
+	fi
+
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~DEVPTS_MULTIPLE_INSTANCES
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	kernel_is ge 3 6 && CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	if [[ ${PV} = *9999* ]]; then
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+			git submodule status | sed 's/^[ +-]//;s/ .*//'
+			git hash-object bootstrap.conf
+		) >.git-module-status
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
+		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+
+	[[ -n ${BACKPORTS} ]] &&
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+			EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+	epatch_user
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r15" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-e "s/USE_FLAG_AVAHI/$(usex avahi avahi-daemon '')/" \
+		-e "s/USE_FLAG_ISCSI/$(usex iscsi iscsid '')/" \
+		-e "s/USE_FLAG_RBD/$(usex rbd  ceph '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	AUTOTOOLS_AUTORECONF=true
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with avahi)
+		$(use_with caps capng)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with libvirtd)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with systemd systemd-daemon)
+		$(usex systemd --with-init-script=systemd '')
+		$(use_with udev)
+		$(use_with uml)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen)
+		$(use_with xen xen-inotify)
+		$(usex xen --with-libxl '')
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+		--without-xenapi
+		--with-esx
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--docdir=/usr/share/doc/${PF}
+		--htmldir=/usr/share/doc/${PF}/html
+		--localstatedir=/var
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	autotools-utils_src_configure
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	# Explicitly allow parallel build of tests
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	autotools-utils_src_compile install \
+		DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)"
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var/cache
+	rm -rf "${D}"/var/run
+	rm -rf "${D}"/var/log
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	use systemd && systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r1" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.2.18-r2 ${REPLACING_VERSIONS} ]]; then
+		FORCE_PRINT_ELOG=true
+	fi
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_print_elog
+}
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -34,7 +34,7 @@ LICENSE="LGPL-2.1"
 IUSE="apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm \
 	lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
 	selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins \
-	xen elibc_glibc"
+	xen"

 REQUIRED_USE="
 	firewalld? ( virt-network )
@ -114,8 +114,7 @@ RDEPEND="
 	udev? (
 		virtual/udev
 		>=x11-libs/libpciaccess-0.10.9
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
+	)"

 DEPEND="${RDEPEND}
 	app-text/xhtml1
--- a/app-emulation/spice-protocol/Manifest
+++ b/app-emulation/spice-protocol/Manifest
@ -1,2 +1,3 @@
+DIST spice-protocol-0.12.10.tar.bz2 103029 SHA256 788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb SHA512 4f6545ced78a4eedf6adca3f10d536a57205626e631d7cf380be4ea08ca2e1fbbe32566e59c2ce1900a7f057a6dab044483b8423885280cbf142b253d8e03711 WHIRLPOOL 224348a06c6116070119de7fc700dc0d3bf3be271b3043d0ebb01200958b145282bbbfee48f2a9ceb2f719bf631832b431a2af5ae6c8a09bc60640336cab5274
 DIST spice-protocol-0.12.3.tar.bz2 69854 SHA256 dc8609efe23e6f9b78d56663aa9ca5e8cb10c2b8403b8fc02aa72ae7686cc037 SHA512 55423743cf195459125305c726803db491ebf16a5ef0cb821eed7e0d71ace9d581b9a6a60c11a03d6a17c0ecc31e2b4c649ed117857a050f409844686b7df3e0 WHIRLPOOL 308ced9222f8b43e2455733fc5d311912bc9d10fbf830d8d4eecd0e86bfd6dc6a0ae15c3d94dc5c3d73aa9635247023259642c570e31557e0ba9caf4bd2c7eb6
 DIST spice-protocol-0.12.9.tar.bz2 71766 SHA256 290cf834dd156014d229b474e98006265ab9c5f63b4c471ea3b2cf8b2ff37876 SHA512 91dd639459a5f20ac37af5a348dcc085690f66274a005017f68a773d23a063ac2c64430c5c78dcead2a144ad0c367b8b12beed0bf80bd146608c8edb9d8080c0 WHIRLPOOL 1f578924b1539ee0c1405478bdd9f37a2d96b2d2e6868f2141b4730f6d1a70e486965a1266af5b1500eefc4a1ee30974f983f585c9d23a7acb762ed2993a13c7
--- a/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.10.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Headers defining the SPICE protocol"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@ -1 +1,2 @@
 DIST spice-0.12.5.tar.bz2 1737169 SHA256 4209a20d8f67cb99a8a6ac499cfe79a18d4ca226360457954a223d6795c2f581 SHA512 1501c913ba3b1856444536a9bfda7a2138a96088f940b483e963df342b91deb945d77bfb3c83ebddfcd7c3008695c0dd7df30ff9fd8502cbbcac1c610a273572 WHIRLPOOL 8f50a91febb0d2279ac867ae31cb14f996106625f0f26ba1bb8b5b576eedce6839f52c70e19a03f03be209f695c36b3ba1d94fadee6c9f134e2afffd5b99c476
+DIST spice-0.12.6.tar.bz2 1181088 SHA256 f148ea30135bf80a4f465ce723a1cd6d4ccb34c098b6298a020b378ace8569b6 SHA512 877d9c447a09055c61db7839ae1a2bbd97ab1178d8fd30fff83883064f8a2f269479649e696732095833ed3fda2d0cc0cbe2a420decb89d36d2cf2f18ad9a3db WHIRLPOOL e381cf469a29be9a91ab442ee5f426a44ee569528d9297401df1c927cbf558e9daee7709cd69a4cc6389481b0c5aa26b19e56f0e97576e270d768842581544fe
--- a/app-emulation/spice/spice-0.12.6.ebuild
+++ b/app-emulation/spice/spice-0.12.6.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit eutils python-any-r1
+
+DESCRIPTION="SPICE server and client"
+HOMEPAGE="http://spice-space.org/"
+SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="client libressl sasl smartcard static-libs" # static
+
+# only the client links against libcacard, the libspice-server only uses the headers
+# the client cannot be built statically since alsa and qemu[smartcard] are missing static-libs
+RDEPEND="
+	>=dev-libs/glib-2.22:2[static-libs(+)?]
+	>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0[static-libs(+)?] )
+	libressl? ( dev-libs/libressl[static-libs(+)?] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	client? (
+		media-libs/alsa-lib
+		>=x11-libs/libXrandr-1.2
+		x11-libs/libX11
+		x11-libs/libXext
+		>=x11-libs/libXinerama-1.0
+		x11-libs/libXfixes
+		x11-libs/libXrender
+		smartcard? ( app-emulation/qemu[smartcard] )
+	)"
+
+DEPEND="
+	>=app-emulation/spice-protocol-0.12.10
+	virtual/pkgconfig
+	$(python_gen_any_dep \
+		'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
+	smartcard? ( app-emulation/qemu[smartcard] )
+	${RDEPEND}"
+
+python_check_deps() {
+	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+# maintainer notes:
+# * opengl support is currently broken
+
+src_prepare() {
+	epatch "${FILESDIR}/0.11.0-gold.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable client) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		--disable-gui \
+		--disable-static-linkage
+#		$(use_enable static static-linkage) \
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
--- a/app-text/dblatex/dblatex-0.3.7.ebuild
+++ b/app-text/dblatex/dblatex-0.3.7.ebuild
@ -18,7 +18,6 @@ IUSE=""

 RDEPEND="
 	app-text/texlive
-	dev-texlive/texlive-htmlxml
 	dev-texlive/texlive-latexextra
 	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-mathextra
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@ -1 +1,2 @@
 DIST mycli-1.4.0.tar.gz 250369 SHA256 300b26d21fc75fecdff04133dac7a22550f8f537b8571985ec02e8e346b00fb5 SHA512 06176a62646be4bac2b90f72bc728afc8920e9ff1b0c04749a5601ee63d35ba2159f48e61e23df6ca3bc5477486f3e3917b3a8de8b7034594f4ed2c544f2969f WHIRLPOOL 6ade59f9c8d7927710df0e2cd4e77cd450468b7558ce9ce763cc54e172a75fd2a84017fe3cc0e9d20a5dbd05585d80d135063b96a7692cd23c76a90806ff1aac
+DIST mycli-1.5.2.tar.gz 260595 SHA256 205f381f2c894863f6bce5d72856032e5e70fb9cc6bf02654943481457d7a63b SHA512 5015cadf10f0a2d31bffe6d2af620b7e4fdc9a40eb1760de49a5080524309330612ca3c75676925fb62c29a6f8ebdc599e725b4ba9b2ec9b741e84a8c9b9363b WHIRLPOOL b1ff602ec341f019c53eef9aca6d2167f95a9b6648f10075ec9f3cf5c5e1eaa590d17b42c561a606781c24a113975903836893e0a8e83f65fe479b7c232f34f4
--- a/dev-db/mycli/mycli-1.5.2.ebuild
+++ b/dev-db/mycli/mycli-1.5.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="http://mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	=dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py"
+	distutils-r1_src_prepare
+}
--- a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
+++ b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator multiprocessing
+
+MY_P=${PN}-src-${PV}
+PATH_P=${PN}-$(get_version_component_range 1-2)
+
+DESCRIPTION="Portable 3D Game Development Kit written in C++"
+HOMEPAGE="http://crystal.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png speex truetype vorbis wxwidgets"
+
+COMMON_DEP="virtual/opengl
+	media-libs/openal
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	sys-libs/zlib
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	ode? ( <dev-games/ode-0.12 )
+	cal3d? ( >=media-libs/cal3d-0.11 )
+	jpeg? ( virtual/jpeg:0 )
+	bullet? ( sci-physics/bullet )
+	vorbis? ( media-libs/libvorbis )
+	speex? ( media-libs/libogg
+		media-libs/speex )
+	truetype? ( >=media-libs/freetype-2.1 )
+	alsa? ( media-libs/alsa-lib )
+	mng? ( media-libs/libmng )
+	png? ( media-libs/libpng:0 )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+	cegui? ( >=dev-games/cegui-0.5.0 )
+	3ds? ( media-libs/lib3ds )"
+
+RDEPEND="${COMMON_DEP}
+	java? ( >=virtual/jre-1.5 )"
+
+DEPEND="${COMMON_DEP}
+	java? ( >=virtual/jdk-1.5
+		dev-java/ant-core )
+	dev-util/ftjam
+	dev-lang/swig
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Installing doc conflict with dodoc on src_install
+	# Removing conflicting target
+	sed -i \
+		-e "/^InstallDoc/d" \
+		Jamfile.in \
+		docs/Jamfile || die
+	epatch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-wxgtk.patch
+	use wxwidgets && append-libs -lGL
+	AT_M4DIR=mk/autoconf \
+		eautoreconf
+}
+
+src_configure() {
+	if use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	econf \
+		--disable-as-needed \
+		--enable-cpu-specific-optimizations=no \
+		--disable-separate-debug-info \
+		--without-lcms \
+		--without-jackasyn \
+		--without-perl \
+		$(use_with java) \
+		--disable-make-emulation \
+		$(use_with bullet) \
+		--without-python \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with mng) \
+		$(use_with vorbis) \
+		$(use_with speex) \
+		$(use_with 3ds) \
+		$(use_with ode) \
+		$(use_with truetype freetype2) \
+		$(use_with cal3d) \
+		$(use_with wxwidgets wx) \
+		$(use_with cegui CEGUI) \
+		$(use_with cg Cg) \
+		$(use_with alsa asound)
+	#remove unwanted CFLAGS added by ./configure
+	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
+		Jamconfig || die
+}
+
+src_compile() {
+	jam -q -dx -j$(makeopts_jobs) || die
+}
+
+src_install() {
+	for installTarget in bin plugin lib include data config bindings
+	do
+		jam -q -s DESTDIR="${D}" install_${installTarget} || die
+	done
+	if use doc; then
+		jam -q -s DESTDIR="${D}" install_doc || die
+	fi
+	dodoc README docs/history*
+
+	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
+	echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
+	doenvd 90crystalspace
+}
+
+pkg_postinst() {
+	elog "Examples coming with this package, need correct light calculation"
+	elog "Do the following commands, with the root account, to fix that:"
+	# Fill cache directory for the examples
+	local dir
+	for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
+		terrain terrainf;
+	do
+		elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
+	done
+}
--- a/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
+++ b/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
@ -0,0 +1,48 @@
+Description: Fix to build with wxwidgets3.0
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-06-14
+
+--- crystalspace-2.0+dfsg.orig/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
+++ crystalspace-2.0+dfsg/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
+@@ -292,7 +292,7 @@ bool csGraphics2DWX::Open()
+   {
+     Display* dpy = (Display*) wxGetDisplay ();
+     GLXContext active_GLContext = glXGetCurrentContext();
+-    XVisualInfo *xvis = (XVisualInfo*)theCanvas->m_vi;
+    XVisualInfo *xvis = theCanvas->GetXVisualInfo();
+ 
+     Report (CS_REPORTER_SEVERITY_NOTIFY, "Video driver GL/X version %s",
+       glXIsDirect (dpy, active_GLContext) ? "(direct renderer)" :
+@@ -705,8 +705,8 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAP (MENU,            CONTEXT,      CONTEXT)
+     MAP (PAUSE,           PAUSE,        PAUSE)
+     MAP (CAPITAL,         CAPSLOCK,     CAPSLOCK)
+-    MAP (PRIOR,           PGUP,         PGUP)
+-    MAP (NEXT,            PGDN,         PGDN)
+    MAP (PAGEUP,          PGUP,         PGUP)
+    MAP (PAGEDOWN,        PGDN,         PGDN)
+     MAP (END,             END,          END)
+     MAP (HOME,            HOME,         HOME)
+     MAP (LEFT,            LEFT,         LEFT)
+@@ -722,10 +722,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAPC (NUMPAD2,        PAD2,         '2')
+     MAP (NUMPAD_DOWN,     PAD2,         DOWN)
+     MAPC (NUMPAD3,        PAD3,         '3')
+-    MAP (NUMPAD_NEXT,     PAD3,         PGDN)
+-#if wxVERSION_NUMBER < 2700
+     MAP (NUMPAD_PAGEDOWN, PAD3,         PGDN)
+-#endif
+     MAPC (NUMPAD4,        PAD4,         '4')
+     MAP (NUMPAD_LEFT,     PAD4,         LEFT)
+     MAPC (NUMPAD5,        PAD5,         '5')
+@@ -736,10 +733,7 @@ static bool wxCodeToCSCode(int wxkey, ut
+     MAPC (NUMPAD8,        PAD8,         '8')
+     MAP (NUMPAD_UP,       PAD8,         UP)
+     MAPC (NUMPAD9,        PAD9,         '9')
+-    MAP (NUMPAD_PRIOR,    PAD9,         PGUP)
+-#if wxVERSION_NUMBER < 2700
+     MAP (NUMPAD_PAGEUP,   PAD9,         PGUP)
+-#endif
+     MAPC (MULTIPLY,       PADMULT,      '*')
+     MAPC (NUMPAD_MULTIPLY,PADMULT,      '*')
+     MAPC (ADD,            PADPLUS,      '+')
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.2.ebuild
@ -33,17 +33,17 @@ RESTRICT="preserve-libs strip"
 QA_PREBUILT="opt/.*"

 # gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=dev-libs/glib-2.40:2
+RDEPEND=">=dev-libs/glib-2.42:2
 	>=dev-libs/nss-3.16.1-r1
 	>=dev-libs/nspr-4.10
 	>=gnome-base/gsettings-desktop-schemas-3.12.2
 	media-fonts/dejavu
 	>=media-libs/fontconfig-2.11:1.0
-	>=media-libs/freetype-2.5.3:2
+	>=media-libs/freetype-2.5.5:2
 	>=media-libs/lcms-2.6:2
-	>=sys-devel/gcc-4.8.4
-	>=sys-libs/glibc-2.20
-	>=sys-libs/zlib-1.2.3-r1
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
 	virtual/jpeg:62
 	alsa? ( >=media-libs/alsa-lib-1.0 )
 	!headless-awt? (
@ -52,7 +52,7 @@ RDEPEND=">=dev-libs/glib-2.40:2
 		>=x11-libs/libX11-1.6
 		>=x11-libs/libXext-1.3
 		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.4
+		>=x11-libs/libXrender-0.9.8
 		>=x11-libs/libXtst-1.2
 	)
 	cjk? (
@ -64,8 +64,8 @@ RDEPEND=">=dev-libs/glib-2.40:2
 	)
 	cups? ( >=net-print/cups-2.0 )
 	gtk? (
-		>=dev-libs/atk-2.12
-		>=x11-libs/cairo-1.12
+		>=dev-libs/atk-2.16.0
+		>=x11-libs/cairo-1.14.2
 		x11-libs/gdk-pixbuf:2
 		>=x11-libs/gtk+-2.24:2
 		>=x11-libs/pango-1.36
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@ -1,5 +1,2 @@
-DIST libgit2-glib-0.0.12.tar.xz 396768 SHA256 193125b314f588894b769058be28101fb0b2bec345520ca6398ee4e8b7319762 SHA512 b3299a20a1a24243604f33dff1e9df0ac0c244049d99e6ec29e9ae405e4370ff229b4b8186593347515930fd483a2b78dcb041d33749076f9dc9778d3674da06 WHIRLPOOL 41adce53f6b08172bcb9940f21141665fbcde04962ede9f68f1797cceeca8c68f156c5668d5a84f392a92ef57f2bc45a9e8b706cd2df98ec0e352ec66463b9cd
-DIST libgit2-glib-0.0.16.tar.xz 396212 SHA256 36fa374e2c01b42aab885c91f9a0da184a21fa06c9e3a273a3d4f593c083627e SHA512 1fcdec0dea0a5ba580e49ebc9805765adbeb827292f9a2686f8289dc98604a332bb4e553f4c74927020352f15eb3e0589c211c4b96d524167dc447268a382194 WHIRLPOOL 236286633c9aec5bcaeaa762e07ea4615081fb610dcf712bea48943aa34cd17ba371c5ec77cf3906ca16c83efe1d710feec486c7fc7c4743a82d1128fd21437e
-DIST libgit2-glib-0.0.24.tar.xz 422768 SHA256 8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8 SHA512 4500abd0e478293a86db1cd82536c6cc818b500b4784b03c168a2827509586d1f3670767e6e410e7e52e827e4e3c6086a538398287cbf1a274dce45edb72874d WHIRLPOOL dbecc4d146ab6f7c4f6bcb919ccda1e1cb5acca5b580cf6dd86c9a989b5a35e56222eab7d70832957a1c87a43e032f2a295869cf01264a10cf5459682e05baad
-DIST libgit2-glib-0.22.0.tar.xz 428776 SHA256 8ae19e1dd2a6b37dd81843182d96dc5f8d439013c26658670a08287abfedaee2 SHA512 8c1d76e93eb21fab823fcaf1067c703d05bf844d16653769c6c58c8b890e1439c8f9fe49bd4035a116785030ffc8d2c3927e42f8c69306233c9990c47621179a WHIRLPOOL 514a47886649e352a9e9589dc0a793ce01dae850ad2e1115761bfe1db4fd10d240dcdf6916c37bd1268e5e252f5dfa2af71aed4d7edcbc9eaaa3588aa6dd0dfe
 DIST libgit2-glib-0.22.8.tar.xz 429300 SHA256 05c9453b195f1af0df2a5d8bc71472c9fb26d14bb8fbb5b688ad1b8ef7a30959 SHA512 caa0076127cd846b31bc9d341ecb0a07b0a4e960b16387b241f1e322627d304636bf59c34a657675444a7a5be66ab645416be0be14cc0e841078f5ce2ac7c9fd WHIRLPOOL 831b57d9da81c5fb3e5ad06a6e7080b1570e2b215eb193a3704cb4b7caa2e361c3290e0b15ab3d27ecc4402756e9d1cd4e8db0da0ea4cd119eafefe32a987213
+DIST libgit2-glib-0.23.6.tar.xz 448916 SHA256 5c8d6b5cb81ab64b96cb0c52ef37463b6d8998a40ce77a08eda9db66fb781144 SHA512 463bc92cd27fdcb6cce0f9f5232a3288b40059fe0ed525b1969cbb7380f76f5bd666e0fdc160b02ef5a4987feb96064b9a3b04682e5b54dbfaa70f5372bfe6f6 WHIRLPOOL f311a5f772008707cb11869bb9960dc355d40c6781457a5efbb554929e769c019a22a741d83eb96dc80f81a004aae4714aa9c0ffd1af794b4ed0cd7ae1c6c9e1
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
+++ b/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
@ -1,75 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8c1559c..94175c9 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -79,32 +79,44 @@ dnl ===========================================================================
- dnl Check for libgit2 ssh support
- dnl ===========================================================================
- 
-AC_MSG_CHECKING([for libgit2 ssh support])
-
-cflags_save="${CFLAGS}"
-libs_save="${LIBS}"
-
-CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-LIBS="${LIBGIT2_GLIB_LIBS}"
-
-AC_TRY_RUN([
-        #include <git2.h>
-        int
-        main(int argc, const char *argv[])
-        {
-                git_threads_init ();
-                return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-        }
-],[
-    AC_MSG_RESULT([yes])
-    git_ssh=yes
-],[
-    AC_MSG_RESULT([no])
-    git_ssh=no
-])
-
-CFLAGS="${cflags_save}"
-LIBS="${libs_save}"
-+AC_ARG_ENABLE([ssh],
-+              AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
-+              [enable_ssh=$enableval],
-+              [enable_ssh="auto"])
-+
-+git_ssh=no
-+
-+if test "x$enable_ssh" != "xno"; then
-+    AC_MSG_CHECKING([for libgit2 ssh support])
-+
-+    cflags_save="${CFLAGS}"
-+    libs_save="${LIBS}"
-+
-+    CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-+    LIBS="${LIBGIT2_GLIB_LIBS}"
-+
-+    AC_TRY_RUN([
-+            #include <git2.h>
-+            int
-+            main(int argc, const char *argv[])
-+            {
-+                    git_threads_init ();
-+                    return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-+            }
-+    ],[
-+        AC_MSG_RESULT([yes])
-+        git_ssh=yes
-+    ],[
-+        AC_MSG_RESULT([no])
-+        git_ssh=no
-+        if test "x$enable_ssh" = "xyes"; then
-+            AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
-+        fi
-+    ])
-+
-+    CFLAGS="${cflags_save}"
-+    LIBS="${libs_save}"
-+fi
- 
- if test "x$git_ssh" = "xyes"; then
- 	LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch
+++ b/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch
@ -1,93 +0,0 @@
-From e67a9ba456bc7f4b6b8c4899179d6b7a2863d592 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Tue, 20 Jan 2015 08:12:41 +0100
-Subject: [PATCH] configure: Add flag to force on or off SSH support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove an automagic dependency on libgit2's SSH support.
-
-Signed-off-by: Rémi Cardona <remi@gentoo.org>
---
- configure.ac | 64 ++++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 38 insertions(+), 26 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1bd96bc..61744db 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -79,32 +79,44 @@ dnl ===========================================================================
- dnl Check for libgit2 ssh support
- dnl ===========================================================================
- 
-AC_MSG_CHECKING([for libgit2 ssh support])
-
-cflags_save="${CFLAGS}"
-libs_save="${LIBS}"
-
-CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-LIBS="${LIBGIT2_GLIB_LIBS}"
-
-AC_TRY_RUN([
-        #include <git2.h>
-        int
-        main(int argc, const char *argv[])
-        {
-                git_libgit2_init ();
-                return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-        }
-],[
-    AC_MSG_RESULT([yes])
-    git_ssh=yes
-],[
-    AC_MSG_RESULT([no])
-    git_ssh=no
-])
-
-CFLAGS="${cflags_save}"
-LIBS="${libs_save}"
-+AC_ARG_ENABLE([ssh],
-+              AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
-+              [enable_ssh=$enableval],
-+              [enable_ssh="auto"])
-+
-+git_ssh=no
-+
-+if test "x$enable_ssh" != "xno"; then
-+    AC_MSG_CHECKING([for libgit2 ssh support])
-+
-+    cflags_save="${CFLAGS}"
-+    libs_save="${LIBS}"
-+
-+    CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-+    LIBS="${LIBGIT2_GLIB_LIBS}"
-+
-+    AC_TRY_RUN([
-+            #include <git2.h>
-+            int
-+            main(int argc, const char *argv[])
-+            {
-+                    git_libgit2_init ();
-+                    return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-+            }
-+    ],[
-+        AC_MSG_RESULT([yes])
-+        git_ssh=yes
-+    ],[
-+        AC_MSG_RESULT([no])
-+        git_ssh=no
-+        if test "x$enable_ssh" = "xyes"; then
-+            AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
-+        fi
-+    ])
-+
-+    CFLAGS="${cflags_save}"
-+    LIBS="${libs_save}"
-+fi
- 
- if test "x$git_ssh" = "xyes"; then
- 	LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
-- 
-2.2.1
-
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_3 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.20.0:=
-	<dev-libs/libgit2-0.21
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable python)
-}
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.21.0:=
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable python)
-}
--- a/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.22.0.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python ssh +vala"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libgit2-0.21.0:=
-	<dev-libs/libgit2-0.23
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-	ssh? ( dev-libs/libgit2[ssh] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.11
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# Make libgit2[ssh] dep non-magic, upstream bug #743236
-	epatch "${FILESDIR}/${PN}-0.22.0-automagic-ssh.patch"
-
-	eautoreconf
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable ssh) \
-		$(use_enable vala)
-}
--- a/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.23.6.ebuild
@ -3,28 +3,27 @@
 # $Id$

 EAPI=5
-
 GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
 VALA_MIN_API_VERSION="0.22"
 VALA_USE_DEPEND="vapigen"

-inherit autotools eutils gnome2 python-r1 vala
+inherit eutils gnome2 python-r1 vala

 DESCRIPTION="Git library for GLib"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="python ssh +vala"

 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

 RDEPEND="
-	=dev-libs/libgit2-0.21*:=
-	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/gobject-introspection-0.10.1
+	>=dev-libs/libgit2-0.23.0:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/gobject-introspection-0.10.1:=
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_USEDEP}] )
@ -37,8 +36,6 @@ DEPEND="${RDEPEND}
 "

 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.0.24-automagic-ssh.patch" # make libgit2[ssh] dep non-magic
-	eautoreconf
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@ -1,3 +1,4 @@
 DIST libvirt-python-1.2.18.tar.gz 171009 SHA256 204535ef160c9d10600b5fc3417f00f382e74b137a85b33774b97eb36d8a3638 SHA512 bf9f246d8bc2e55dc0cdeb22901b2dd2858b058c0616a2d5db3ca4a700c3430c9cd1f904ec3090cab7c3db1d40195a6365fed3b7b18fbd1d975fdca5fa57ce29 WHIRLPOOL a1e684360341b896bd96d6a313320ddb7ad455c64e4d1577076713e4913c95d2bd6f9222a6ac45b735a33d8e7fff06b40327e298d21e214857db17c859fb4849
 DIST libvirt-python-1.2.19.tar.gz 172149 SHA256 88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49 SHA512 670cc7af3fc5e67fa8daa8312278ecf81608ceddd34c40fc799e0c2836a5a8c3489186dee5ffcd806bf70840c1aa7b64178eef334f35c4bbe5fe21413b473d3b WHIRLPOOL 74e73e1dcabd0ed67988f34cd12c7ecc3d71e5dbfc4a5f81f22e3aeed37ee3fa343b780bbafa7941a79abffdb4d7a566e65b73c185c695567d6558e18ef58b32
 DIST libvirt-python-1.2.20.tar.gz 170437 SHA256 e1ea097546edc7cb0e7fd01e2ca9906ac12cc4f16d07f15f8f0f5154626ba446 SHA512 2fd642b1f7efee46331636098e8bc9d1194f399bb93e9d445103a70264332bb6b216bb42846432707e1538f73f96c4c141dde84779d3b36cc93f6f7914466ef9 WHIRLPOOL 19c56d69a8c61814b8312e5b0920efae6433bffe3cd33237a34efb6847abd4bafa686481cd40c72cc0f92290d0c70efc53d83c42d2b6a2f20928608321c41351
+DIST libvirt-python-1.2.21.tar.gz 171250 SHA256 7ffb49fcb64ac06188fc626c853c99361e5965766ab020f8ea66f8fbcfc29684 SHA512 7e2481ffa26105ddde703bd6eafe74240b69990b2f2ce0042f20f7fceb1d326fb8a66bf26042bfe63a12cf3202d7c19b14b6d766dd42fb66af212393d7aaf332 WHIRLPOOL 18dd5bc0d565b6846c40960cf258d7fb3714054be15fe54507e2846c5a7c2cd81e9b209c8e70cbfd5319d5a06f00c2c5322995058637af87d1676276f8675b2e
--- a/dev-python/libvirt-python/libvirt-python-1.2.21.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-1.2.21.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+AUTOTOOLIZE=yes
+
+MY_P="${P/_rc/-rc}"
+
+inherit eutils distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="http://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+# testsuite is currently not included in upstream tarball
+RESTRICT="test"
+
+python_test() {
+	esetup.py test
+}
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@ -0,0 +1 @@
+DIST maxitest-1.5.4.tar.gz 13723 SHA256 d03018f2a0d0414b7ce9df7a1326e6b0d615323b109084f3191472027d60a24c SHA512 b2b7c0ac561f7f62f94a86d1f84b1aa4e9dfe65840607ebc1178055e82a759aed74637a721c7eeb234e5efdf52ef6386e36097dcb165bbd001758a96e588d8e6 WHIRLPOOL c3fbc53e5e23da0e85fcdab9578af13b278dca9bea6738ca9ebe6eeecb8e72783e5c147d4e79dbe03185e365856dbdcbadf8a936916393946fd0f9ae5b3bf097
--- a/dev-ruby/maxitest/maxitest-1.5.4.ebuild
+++ b/dev-ruby/maxitest/maxitest-1.5.4.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.9.0:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
+		-e 's/git ls-files/find/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/byebug/ s:^:#:' Gemfile || die
+
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
--- a/dev-ruby/maxitest/metadata.xml
+++ b/dev-ruby/maxitest/metadata.xml
@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>ruby</herd>
+	<upstream>
+		<remote-id type="github">grosser/maxitest</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@ -1,2 +1,3 @@
 DIST rack-cache-1.2.gem 261632 SHA256 02bfed05f8b3266db804f2fa445801636ca2c6d211a3137ec796f88af5756e1c SHA512 510e0b98af47170b9030578feadf534132ae473b093df3f1fce6022fb97883b4c56dee441dd06df50e0ea06c4f0a1d00e11bf63f165e29d1e451f28ee8c17177 WHIRLPOOL f8ec4a460bf1bc89dad9dc6b666f6dfa3e8409434a3380d357c945f29da63bec609285c118ed28ce209f207ee3aaa56dd4ba5f3992286f762c2d33f4572b61f8
 DIST rack-cache-1.3.0.tar.gz 258225 SHA256 356f849e285fa2cf00c1d6823aa2202d14add67815b07b70048242f7c61c6df8 SHA512 d7028456b7059b775a75f35ae2f7a4a00bfe908ebc7e7f57b2f659f9690ac40085d3dc89acd0b1e540cf309e218a276504650a50f092557b7ef871a66aa6bfbf WHIRLPOOL 8e456b7eff61913cd75c2f1a20c55ff6f1430ca28384b6d743c976df7677b3334e6c83628c1fc9fb7d11b268b71c5c8e653ad8b0c59430a691071c37a657e916
+DIST rack-cache-1.5.1.tar.gz 258817 SHA256 77afa21e3d2c97224795b740d4a67b23e2fbb15515b774b897993343265545f5 SHA512 e7d2804d2e4f48f8333ee9689251f760290eb15c692a55dd1bfdcfcbecc677afbf6db949c8ca9bc79e7248c58ca5f6f89bc13ab912c34f33e119befcdde902f8 WHIRLPOOL e3808050537411af5f210b7201da8f3b2b4d499a20e9a161ef29c88edba80348919629b23b929d9361982c4c328dcdae25eba3c616cbbab0ef626da6bfa0d590
--- a/dev-ruby/rack-cache/rack-cache-1.5.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.5.1.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="A drop-in component to enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e "2i require 'timeout'" \
+		test/spec_setup.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@ -1,5 +1 @@
-DIST gitg-0.2.7.tar.xz 528904 SHA256 c07fc4fc6cef31a06f0b9daa2ed23a5d0f6cb0a10a728324970675fc7001d095 SHA512 8d07e3410691a9ea4772e8db546d3da87f4517ac35111156c6cba3b9317e02fc7dd63a79c05aa0700ce59d2739d0c680d33825e3a8c8c7c242db7ac8ae6962c4 WHIRLPOOL 743a07f6478b0d2526aa1b1f2197353029caacd32d9fbfe75d32a287d4e55caf9441de69b5dfbf40c11597101016bdc843c2f1f0fe893370ee24ba2a06e43b9f
-DIST gitg-0.3.2.tar.xz 1080536 SHA256 77a30eb46ccd1882dca5a2bc4b43850c1066b1c406de86e335628c1c5a2a6c0f SHA512 cd8a24a5dfa833b4380e0b8da647bb6bfe97a28e9ba57fc26c9806939b06416f7728006fe247cf07264931d420416f25ac307051b672184b06809d750d3ed928 WHIRLPOOL 24230a3926f98c9f115cb1367091558aa68dc773c8b1c5c64992ef605d5b89862cbd1d9c898ebc9a4ab7c1ce837ccda7a7a08c8c680a9da3bf9dfad668a01869
-DIST gitg-3.14.0.tar.xz 1194904 SHA256 8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b SHA512 cf52ae6e892dcca40894a921810ab7cc1df4923c00f040d658db88e4ccbba2605181addbd64aa61eb35bc8a6e44172a35601371664d87b5b35439f3547877c30 WHIRLPOOL 658829d4bf999b86f8ead87a69579c72f02ed5373d5aaeda973ce31b93ace67596c13b8450f6b2aa76e98dfe0e7047d41864b008042040913b5a44e8f2b8ee21
-DIST gitg-3.14.1.tar.xz 1197524 SHA256 8e485b35d918fddc255c3bf5d5c139d0a8b684bd922a8913153b1b7781357057 SHA512 65748b8efa664528853d7f9fedcb84ed7c676492ffaedf404767eb99d1fbaf03db8752df957686ec474f540e393f98ad860ffb35af59b9024da63404d62b5a40 WHIRLPOOL 08f99d7ecf25055f22a2a994d74f033bdcfe31e74e26447f95ae56dfe98d97d097d04ca97f87babd085e125626b114fbf8663c16f1fd735cd2b743aef0e19126
 DIST gitg-3.16.1.tar.xz 1322412 SHA256 914e964402dadda152c7e034906d84e266c474603f58bc1a300f2a1659615569 SHA512 30ea13cfbd14d82db4d0db5ff5ffd456a8ceaa2364e8f3b9eff224c268de46b5dab070a068b3dc9497c7acd90023f60618a4bd5041dab35516ca336421454419 WHIRLPOOL 2774a264e00e28a27728ce4c7791a0340702893c52f32dd141f1ffc682516c4643a94d62b21ddc959b6fbb35c7cff73942cd62a77bcf3ac22991853bfe4f6ec9
--- a/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch
+++ b/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch
@ -1,58 +0,0 @@
-From eeec06ef06073b28f011a2be5417f4398d187c2e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 27 Mar 2011 22:42:29 +0200
-Subject: [PATCH] Fix --disable-debug
-
---
- gitg-debug.c |    7 +++++++
- gitg-debug.h |    4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/libgitg/gitg-debug.c b/libgitg/gitg-debug.c
-index 6530e7a..781101e 100644
--- a/libgitg/gitg-debug.c
-+++ b/libgitg/gitg-debug.c
-@@ -21,6 +21,7 @@
-  */
- 
- #include "gitg-debug.h"
-+#if ENABLE_DEBUG
- #include <glib.h>
- #include <stdio.h>
- 
-@@ -72,3 +73,9 @@ gitg_debug_message (guint level,
- 		g_free (msg);
- 	}
- }
-+
-+#else
-+
-+void gitg_debug_init (void) { }
-+
-+#endif /* ENABLE_DEBUG */
-diff --git a/libgitg/gitg-debug.h b/libgitg/gitg-debug.h
-index 55d4428..ab81b4e 100644
--- a/libgitg/gitg-debug.h
-+++ b/libgitg/gitg-debug.h
-@@ -35,8 +35,9 @@ enum
- 	GITG_DEBUG_CONFIG = 1 << 3
- };
- 
-#if ENABLE_DEBUG
- void gitg_debug_init (void);
-+
-+#if ENABLE_DEBUG
- gboolean gitg_debug_enabled (guint debug);
- 
- void gitg_debug_message (guint level,
-@@ -49,7 +50,6 @@ void gitg_debug_message (guint level,
- #define gitg_debug(level,args...) gitg_debug_message (level, __FILE__, __LINE__, G_STRFUNC, args)
- #else
- 
-#define gitg_debug_init ;
- #define gitg_debug_enabled(x) FALSE
- #define gitg_debug(level,args...) ;
- 
-- 
-1.7.4.1
-
--- a/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch
+++ b/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch
@ -1,371 +0,0 @@
-From 9fda4e3c22475059f4910d3072e01c4436bfeca9 Mon Sep 17 00:00:00 2001
-From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-Date: Thu, 28 Mar 2013 00:08:17 +0100
-Subject: [PATCH] lp#1056378: make end to nonsensical premature 8-bit
- optimization
-
- 128 lanes are _not_ enough for everyone
---
- gitg/gitg-cell-renderer-path.c |  8 ++++----
- libgitg/gitg-color.c           |  6 +++---
- libgitg/gitg-color.h           |  2 +-
- libgitg/gitg-lane.h            |  2 +-
- libgitg/gitg-lanes.c           | 40 ++++++++++++++++++++--------------------
- libgitg/gitg-lanes.h           |  2 +-
- libgitg/gitg-repository.c      |  4 ++--
- libgitg/gitg-revision.c        |  8 ++++----
- libgitg/gitg-revision.h        |  6 +++---
- 9 files changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/gitg/gitg-cell-renderer-path.c b/gitg/gitg-cell-renderer-path.c
-index 97902ee..e2ae957 100644
--- a/gitg/gitg-cell-renderer-path.c
-+++ b/gitg/gitg-cell-renderer-path.c
-@@ -151,7 +151,7 @@ static void
- draw_arrow (GitgCellRendererPath *self,
-             cairo_t              *cr,
-             const GdkRectangle   *area,
-            gint8                 laneidx,
-+            gint32                 laneidx,
-             gboolean              top)
- {
- 	gdouble cw = self->priv->lane_width;
-@@ -187,7 +187,7 @@ draw_paths_real (GitgCellRendererPath *self,
- 	}
- 
- 	GSList *lanes = gitg_revision_get_lanes (revision);
-	gint8 to = 0;
-+	gint32 to = 0;
- 	gdouble cw = self->priv->lane_width;
- 	gdouble ch = area->height / 2.0;
- 	GitgLane *lane;
-@@ -201,7 +201,7 @@ draw_paths_real (GitgCellRendererPath *self,
- 
- 		for (item = lane->from; item; item = item->next)
- 		{
-			gint8 from = (gint8)GPOINTER_TO_INT (item->data);
-+			gint32 from = (gint32)GPOINTER_TO_INT (item->data);
- 
- 			cairo_move_to (cr, area->x + from * cw + cw / 2.0,
- 			               area->y + yoffset * ch);
-@@ -241,7 +241,7 @@ draw_arrows (GitgCellRendererPath *self,
-              const GdkRectangle   *area)
- {
- 	GSList *item;
-	gint8 to = 0;
-+	gint32 to = 0;
- 
- 	for (item = gitg_revision_get_lanes (self->priv->revision); item; item = item->next)
- 	{
-diff --git a/libgitg/gitg-color.c b/libgitg/gitg-color.c
-index d5eeb85..f13dd77 100644
--- a/libgitg/gitg-color.c
-+++ b/libgitg/gitg-color.c
-@@ -23,7 +23,7 @@
- #include "gitg-color.h"
- #include <gdk/gdk.h>
- 
-static gint8 current_index = 0;
-+static gint32 current_index = 0;
- 
- static gchar const *palette[] = {
- 	"#c4a000",
-@@ -72,10 +72,10 @@ gitg_color_set_cairo_source (GitgColor *color, cairo_t *cr)
- 	cairo_set_source_rgb(cr, r, g, b);
- }
- 
-static gint8
-+static gint32
- next_index ()
- {
-	gint8 next = current_index++;
-+	gint32 next = current_index++;
- 
- 	if (current_index == sizeof(palette) / sizeof(gchar const *))
- 		current_index = 0;
-diff --git a/libgitg/gitg-color.h b/libgitg/gitg-color.h
-index c3c9bd3..1968597 100644
--- a/libgitg/gitg-color.h
-+++ b/libgitg/gitg-color.h
-@@ -33,7 +33,7 @@ typedef struct _GitgColor GitgColor;
- struct _GitgColor
- {
- 	gulong ref_count;
-	gint8 index;
-+	gint32 index;
- };
- 
- void gitg_color_reset (void);
-diff --git a/libgitg/gitg-lane.h b/libgitg/gitg-lane.h
-index 61664db..4ce0737 100644
--- a/libgitg/gitg-lane.h
-+++ b/libgitg/gitg-lane.h
-@@ -47,7 +47,7 @@ typedef struct
- {
- 	GitgColor *color; /** Pointer to color */
- 	GSList *from; /** List of lanes merging on this lane */
-	gint8 type;
-+	gint32 type;
- } GitgLane;
- 
- typedef struct
-diff --git a/libgitg/gitg-lanes.c b/libgitg/gitg-lanes.c
-index 41b8650..f3aaa61 100644
--- a/libgitg/gitg-lanes.c
-+++ b/libgitg/gitg-lanes.c
-@@ -46,7 +46,7 @@ typedef struct
- typedef struct
- {
- 	GitgColor *color;
-	gint8 index;
-+	gint32 index;
- 	gchar const *from;
- 	gchar const *to;
- } CollapsedLane;
-@@ -109,10 +109,10 @@ free_lanes (GitgLanes *lanes)
- static LaneContainer *
- find_lane_by_hash (GitgLanes   *lanes,
-                    gchar const *hash,
-                   gint8       *pos)
-+                   gint32       *pos)
- {
- 	GSList *item;
-	gint8 p = 0;
-+	gint32 p = 0;
- 
- 	if (!hash)
- 	{
-@@ -344,14 +344,14 @@ lane_container_next (LaneContainer *container,
- 
- static void
- update_lane_merge_indices (GSList *from,
-                           gint8   index,
-+                           gint32   index,
-                            gint    direction)
- {
- 	GSList *item;
- 
- 	for (item = from; item; item = g_slist_next (item))
- 	{
-		gint8 idx = GPOINTER_TO_INT (item->data);
-+		gint32 idx = GPOINTER_TO_INT (item->data);
- 
- 		if ((direction < 0 && idx > index) || (direction > 0 && idx >= index))
- 		{
-@@ -362,7 +362,7 @@ update_lane_merge_indices (GSList *from,
- 
- static void
- update_merge_indices (GSList *lanes,
-                      gint8   index,
-+                      gint32   index,
-                       gint    direction)
- {
- 	GSList *item;
-@@ -378,7 +378,7 @@ update_merge_indices (GSList *lanes,
- static void
- add_collapsed (GitgLanes     *lanes,
-                LaneContainer *container,
-               gint8          index)
-+               gint32          index)
- {
- 	CollapsedLane *collapsed = collapsed_lane_new (container);
- 	collapsed->index = index;
-@@ -389,7 +389,7 @@ add_collapsed (GitgLanes     *lanes,
- static void
- collapse_lane (GitgLanes     *lanes,
-                LaneContainer *container,
-               gint8          index)
-+               gint32          index)
- {
- 	/* backtrack for inactive-collapse revisions and remove this container from
- 	   those revisions, appropriately updating merge indices etc */
-@@ -409,7 +409,7 @@ collapse_lane (GitgLanes     *lanes,
- 			GSList *collapsed = g_slist_nth(lns, index);
- 			GitgLane *lane = (GitgLane *)collapsed->data;
- 
-			gint8 newindex = GPOINTER_TO_INT(lane->from->data);
-+			gint32 newindex = GPOINTER_TO_INT(lane->from->data);
- 
- 			lns = gitg_revision_remove_lane(revision, lane);
- 
-@@ -445,8 +445,8 @@ collapse_lane (GitgLanes     *lanes,
- 
- static void
- update_current_lanes_merge_indices (GitgLanes *lanes,
-                                    gint8      index,
-                                    gint8      direction)
-+                                    gint32      index,
-+                                    gint32      direction)
- {
- 	GSList *item;
- 
-@@ -462,7 +462,7 @@ static void
- collapse_lanes (GitgLanes *lanes)
- {
- 	GSList *item = lanes->priv->lanes;
-	gint8 index = 0;
-+	gint32 index = 0;
- 
- 	while (item)
- 	{
-@@ -490,9 +490,9 @@ collapse_lanes (GitgLanes *lanes)
- 	}
- }
- 
-static gint8
-+static gint32
- ensure_correct_index (GitgRevision *revision,
-                      gint8         index)
-+                      gint32         index)
- {
- 	guint len = g_slist_length (gitg_revision_get_lanes (revision));
- 
-@@ -509,11 +509,11 @@ expand_lane (GitgLanes     *lanes,
-              CollapsedLane *lane)
- {
- 	GSList *item;
-	gint8 index = lane->index;
-+	gint32 index = lane->index;
- 
- 	GitgLane *ln = gitg_lane_new_with_color (lane->color);
- 	guint len = g_slist_length (lanes->priv->lanes);
-	gint8 next;
-+	gint32 next;
- 
- 	if (index > len)
- 	{
-@@ -614,7 +614,7 @@ static void
- init_next_layer (GitgLanes *lanes)
- {
- 	GSList *item = lanes->priv->lanes;
-	gint8 index = 0;
-+	gint32 index = 0;
- 
- 	/* Initialize new set of lanes based on 'lanes'. It copies the lane (refs
- 	   the color) and adds the lane index as a merge (so it basicly represents
-@@ -628,7 +628,7 @@ init_next_layer (GitgLanes *lanes)
- }
- 
- static void
-prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
-+prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint32 *pos)
- {
- 	LaneContainer *mylane;
- 	guint num;
-@@ -647,7 +647,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
- 	/* Iterate over all parents and find them a lane */
- 	for (i = 0; i < num; ++i)
- 	{
-		gint8 lnpos;
-+		gint32 lnpos;
- 		LaneContainer *container = find_lane_by_hash (lanes, parents[i], &lnpos);
- 
- 		if (container)
-@@ -710,7 +710,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos)
- }
- 
- GSList *
-gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint8 *nextpos)
-+gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint32 *nextpos)
- {
- 	LaneContainer *mylane;
- 	GSList *res;
-diff --git a/libgitg/gitg-lanes.h b/libgitg/gitg-lanes.h
-index ae71757..8e02bbb 100644
--- a/libgitg/gitg-lanes.h
-+++ b/libgitg/gitg-lanes.h
-@@ -55,7 +55,7 @@ GType gitg_lanes_get_type (void) G_GNUC_CONST;
- 
- GitgLanes *gitg_lanes_new(void);
- void gitg_lanes_reset(GitgLanes *lanes);
-GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint8 *mylane);
-+GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint32 *mylane);
- 
- G_END_DECLS
- 
-diff --git a/libgitg/gitg-repository.c b/libgitg/gitg-repository.c
-index f1d1b18..2751800 100644
--- a/libgitg/gitg-repository.c
-+++ b/libgitg/gitg-repository.c
-@@ -865,7 +865,7 @@ append_revision (GitgRepository *repository,
-                  GitgRevision   *rv)
- {
- 	GSList *lanes;
-	gint8 mylane = 0;
-+	gint32 mylane = 0;
- 
- 	if (repository->priv->size == 0)
- 	{
-@@ -1158,7 +1158,7 @@ repository_relane (GitgRepository *repository)
- 
- 	for (i = 0; i < repository->priv->size; ++i)
- 	{
-		gint8 mylane;
-+		gint32 mylane;
- 		GitgRevision *revision = repository->priv->storage[i];
- 
- 		GSList *lanes = gitg_lanes_next (repository->priv->lanes,
-diff --git a/libgitg/gitg-revision.c b/libgitg/gitg-revision.c
-index 579c878..37ca641 100644
--- a/libgitg/gitg-revision.c
-+++ b/libgitg/gitg-revision.c
-@@ -45,7 +45,7 @@ struct _GitgRevision
- 	char sign;
- 
- 	GSList *lanes;
-	gint8 mylane;
-+	gint32 mylane;
- };
- 
- G_DEFINE_BOXED_TYPE (GitgRevision, gitg_revision, gitg_revision_ref, gitg_revision_unref)
-@@ -303,7 +303,7 @@ update_lane_type (GitgRevision *revision)
- void
- gitg_revision_set_lanes (GitgRevision *revision,
-                          GSList       *lanes,
-                         gint8         mylane)
-+                         gint32         mylane)
- {
- 	free_lanes (revision);
- 	revision->lanes = lanes;
-@@ -316,7 +316,7 @@ gitg_revision_set_lanes (GitgRevision *revision,
- 	update_lane_type (revision);
- }
- 
-gint8
-+gint32
- gitg_revision_get_mylane (GitgRevision *revision)
- {
- 	return revision->mylane;
-@@ -324,7 +324,7 @@ gitg_revision_get_mylane (GitgRevision *revision)
- 
- void
- gitg_revision_set_mylane (GitgRevision *revision,
-                          gint8         mylane)
-+                          gint32         mylane)
- {
- 	g_return_if_fail (mylane >= 0);
- 
-diff --git a/libgitg/gitg-revision.h b/libgitg/gitg-revision.h
-index e01a141..72051d7 100644
--- a/libgitg/gitg-revision.h
-+++ b/libgitg/gitg-revision.h
-@@ -64,13 +64,13 @@ gchar **gitg_revision_get_parents (GitgRevision *revision);
- 
- GSList *gitg_revision_get_lanes (GitgRevision *revision);
- GitgLane *gitg_revision_get_lane (GitgRevision *revision);
-void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint8 mylane);
-+void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint32 mylane);
- 
- GSList *gitg_revision_remove_lane (GitgRevision *revision, GitgLane *lane);
- GSList *gitg_revision_insert_lane (GitgRevision *revision, GitgLane *lane, gint index);
- 
-gint8 gitg_revision_get_mylane (GitgRevision *revision);
-void gitg_revision_set_mylane (GitgRevision *revision, gint8 mylane);
-+gint32 gitg_revision_get_mylane (GitgRevision *revision);
-+void gitg_revision_set_mylane (GitgRevision *revision, gint32 mylane);
- 
- void gitg_revision_set_sign(GitgRevision *revision, char sign);
- char gitg_revision_get_sign(GitgRevision *revision);
-- 
-1.8.1.5
-
--- a/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch
+++ b/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch
@ -1,123 +0,0 @@
- gitg/gitg-author-details-dialog.vala | 1 -
- gitg/gitg-clone-dialog.vala          | 5 +----
- libgitg/gitg-commit.vala             | 4 ++--
- libgitg/gitg-lanes.vala              | 4 ++--
- tests/libgitg/test-commit.vala       | 2 +-
- 5 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/gitg/gitg-author-details-dialog.vala b/gitg/gitg-author-details-dialog.vala
-index 64cdb65..59f66dd 100644
--- a/gitg/gitg-author-details-dialog.vala
-+++ b/gitg/gitg-author-details-dialog.vala
-@@ -81,7 +81,6 @@ namespace Gitg
- 
- 			try
- 			{
-				d_config.refresh();
- 				author_name = d_config.get_string("user.name");
- 			}
- 			catch {}
-diff --git a/gitg/gitg-clone-dialog.vala b/gitg/gitg-clone-dialog.vala
-index 94eb610..60390f9 100644
--- a/gitg/gitg-clone-dialog.vala
-+++ b/gitg/gitg-clone-dialog.vala
-@@ -80,9 +80,8 @@ public class CloneDialog : Gtk.Dialog
- 		d_entry_url.changed.connect((e) => {
- 			string ?tooltip_text = null;
- 			string ?icon_name = null;
-			bool url_supported = Ggit.Remote.is_supported_url(d_entry_url.get_text());
- 
-			if (!url_supported && (d_entry_url.text != ""))
-+			if (d_entry_url.text != "")
- 			{
- 				icon_name = "dialog-warning-symbolic";
- 				tooltip_text = _("The URL introduced is not supported");
-@@ -90,8 +89,6 @@ public class CloneDialog : Gtk.Dialog
- 
- 			d_entry_url.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon_name);
- 			d_entry_url.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, tooltip_text);
-
-			set_response_sensitive(Gtk.ResponseType.OK, url_supported);
- 		});
- 	}
- }
-diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala
-index 2aba60d..2ec5a4c 100644
--- a/libgitg/gitg-commit.vala
-+++ b/libgitg/gitg-commit.vala
-@@ -122,7 +122,7 @@ public class Commit : Ggit.Commit
- 			var parents = get_parents();
- 
- 			// Create a new diff from the parents to the commit tree
-			if (parents.size() == 0)
-+			if (parents.size == 0)
- 			{
- 				diff = new Ggit.Diff.tree_to_tree(repo,
- 				                                  null,
-@@ -131,7 +131,7 @@ public class Commit : Ggit.Commit
- 			}
- 			else
- 			{
-				for (var i = 0; i < parents.size(); ++i)
-+				for (var i = 0; i < parents.size; ++i)
- 				{
- 					var parent = parents.get(0);
- 
-diff --git a/libgitg/gitg-lanes.vala b/libgitg/gitg-lanes.vala
-index 06886dc..f2d99f5 100644
--- a/libgitg/gitg-lanes.vala
-+++ b/libgitg/gitg-lanes.vala
-@@ -158,7 +158,7 @@ public class Lanes : Object
- 		init_next_layer();
- 		var mylane = d_lanes[pos];
- 
-		for (uint i = 0; i < parents.size(); ++i)
-+		for (uint i = 0; i < parents.size; ++i)
- 		{
- 			int lnpos;
- 			var poid = parents.get_id(i);
-@@ -439,7 +439,7 @@ public class Lanes : Object
- 
- 		var parents = commit.get_parents();
- 
-		for (uint i = 0; i < parents.size(); ++i)
-+		for (uint i = 0; i < parents.size; ++i)
- 		{
- 			expand_lane_from_oid(parents.get_id(i));
- 		}
-diff --git a/tests/libgitg/test-commit.vala b/tests/libgitg/test-commit.vala
-index fd0c137..65c0473 100644
--- a/tests/libgitg/test-commit.vala
-+++ b/tests/libgitg/test-commit.vala
-@@ -252,7 +252,7 @@ class Gitg.Test.Commit : Gitg.Test.Repository
- 			assert_streq(d_repository.get_head().get_target().to_string(),
- 			             oid.to_string());
- 
-			assert_uinteq(commit.get_parents().size(), 0);
-+			assert_uinteq(commit.get_parents().size, 0);
- 
- 			var reflog = d_repository.lookup_reference("HEAD").get_log();
- 			var entry = reflog.get_entry_from_index(0);
- libgitg/gitg-repository-list-box.vala | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala
-index 8dd5b33..393b29e 100644
--- a/libgitg/gitg-repository-list-box.vala
-+++ b/libgitg/gitg-repository-list-box.vala
-@@ -494,14 +494,13 @@ namespace Gitg
- 				d_row = row;
- 			}
- 
-			protected override bool transfer_progress(Ggit.TransferProgress stats) throws Error
-+			protected override void transfer_progress(Ggit.TransferProgress stats)
- 			{
- 				var recvobj = stats.get_received_objects();
- 				var indxobj = stats.get_indexed_objects();
- 				var totaobj = stats.get_total_objects();
- 
- 				d_row.fraction = (recvobj + indxobj) / (double)(2 * totaobj);
-				return true;
- 			}
- 		}
- 
--- a/dev-vcs/gitg/gitg-0.2.7.ebuild
+++ b/dev-vcs/gitg/gitg-0.2.7.ebuild
@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-inherit base eutils gnome2
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gitg/"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# FIXME: debug changes CFLAGS
-IUSE="debug glade"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-3.0.0:3
-	>=x11-libs/gtksourceview-3.1.3:3.0
-	>=gnome-base/gconf-2.10:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	dev-vcs/git
-	glade? ( >=dev-util/glade-3.2:3.10 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.6-fix-libreoffice.patch"
-)
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	base_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecations
-		--disable-dependency-tracking
-		--disable-maintainer-mode
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)"
-
-	gnome2_src_configure
-}
-
-src_test() {
-	default
-}
--- a/dev-vcs/gitg/gitg-0.3.2.ebuild
+++ b/dev-vcs/gitg/gitg-0.3.2.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.20"
-PYTHON_COMPAT=( python3_3 )
-
-inherit autotools gnome2 python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug glade +python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	dev-libs/libgee:0.8[introspection]
-	>=dev-libs/json-glib-0.16
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.10.1
-	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.0.10
-	<dev-libs/libgit2-glib-0.0.16
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=net-libs/webkit-gtk-2.2:3[introspection]
-	>=x11-libs/gtk+-3.10.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.10
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	$(vala_depend)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	sed \
-		-e '/CFLAGS/s:-g::g' \
-		-e '/CFLAGS/s:-O0::g' \
-		-i configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecations
-		--disable-dependency-tracking
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)
-		$(use_enable python)"
-
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install -j1
-}
--- a/dev-vcs/gitg/gitg-3.14.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.14.0.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.20"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit autotools gnome2 python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug glade +python"
-
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	dev-libs/libgee:0.8[introspection]
-	>=dev-libs/json-glib-0.16
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.10.1
-	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.0.20
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=net-libs/webkit-gtk-2.2:3[introspection]
-	>=x11-libs/gtk+-3.12.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.10
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-libs/libgit2-glib[vala]
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	$(vala_depend)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	sed \
-		-e '/CFLAGS/s:-g::g' \
-		-e '/CFLAGS/s:-O0::g' \
-		-i configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	# Disable maintainer to get rid of -Werror  (bug #363009)
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-deprecations
-		--disable-dependency-tracking
-		$(use_enable debug)
-		$(use_enable glade glade-catalog)
-		$(use_enable python)"
-
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install -j1
-}
--- a/dev-vcs/gitg/gitg-3.14.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.14.1.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.20"
-PYTHON_COMPAT=( python{3_3,3_4} )
-
-inherit autotools gnome2 python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug glade +python"
-
-REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	dev-libs/libgee:0.8[introspection]
-	>=dev-libs/json-glib-0.16
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.10.1
-	dev-libs/libgit2[threads]
-	>=dev-libs/libgit2-glib-0.22.0
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=net-libs/webkit-gtk-2.2:4[introspection]
-	>=x11-libs/gtk+-3.12.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	>=x11-themes/gnome-icon-theme-symbolic-3.10
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libpeas[python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/libgit2-glib-0.22.0[vala]
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	$(vala_depend)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libgit2-glib-0.22.0.patch
-)
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	sed \
-		-e '/CFLAGS/s:-g::g' \
-		-e '/CFLAGS/s:-O0::g' \
-		-i configure.ac || die
-
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-deprecations \
-		--disable-dependency-tracking \
-		$(use_enable debug) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable python)
-}
-
-src_install() {
-	gnome2_src_install -j1
-}
--- a/gnome-base/gvfs/gvfs-1.26.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.26.2.ebuild
@ -29,7 +29,7 @@ RDEPEND="
 	>=dev-libs/glib-2.45.7:2
 	sys-apps/dbus
 	dev-libs/libxml2:2
-	>=dev-libs/libgdata-0.17.3:=
+	>=dev-libs/libgdata-0.17.3:=[gnome]
 	net-misc/openssh
 	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
 	archive? ( app-arch/libarchive:= )
--- a/gnome-extra/gnome-builder/Manifest
+++ b/gnome-extra/gnome-builder/Manifest
@ -1 +1,2 @@
 DIST gnome-builder-3.16.3.tar.xz 1733356 SHA256 a1d7b287d39ce724114c128e25bb00e273ecd8982ed22c8aba48cad9c4d51e61 SHA512 bd552763e958dd121f20adefab68de7d40d66fb3253c21ac9fe97eef7ffb5e98ea2b4ba21522db2cf1626c989bd6c04b27a16ba5e7ecb0bb66afc6299979652c WHIRLPOOL e690fafd8271fd9fd2908424f684bf2704bb768e51e50a8a983eb32f22e1d6807d66f381ebee849b8d7b73d4658301a57fbe6eeb32958ca9dd84ecb934a01d61
+DIST gnome-builder-3.18.1.tar.xz 1510460 SHA256 501c95220dcf8ca44a5748e863492377fe2c3aee78a95973d6819b1836e5407c SHA512 8e53b0d7a0afe440708bf33357408424cca5302e4516f85af18d04bce787012db681c93b6f48e9d41d8cb1a7c050d5e68770bf2e1ed8814ed43fa91e1d60c0f1 WHIRLPOOL d805338a3b49fe56794ddd9dca1ff047a4a9c87de24d06fed377637dba4e2ce8cf953cc8770e8745666dde1abfaabee9c68827631605a24e76e06148bed03f5b
--- a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-single-r1 vala virtualx
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: some unittests seem to hang forever
+RDEPEND="
+	>=dev-libs/gjs-1.42
+	>=dev-libs/glib-2.45.8:2[dbus]
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.23.4[ssh]
+	>=dev-libs/libpeas-1.14.1
+	>=dev-libs/libxml2-2.9
+	dev-util/uncrustify
+	sys-devel/clang
+	>=x11-libs/gtk+-3.17.8:3[introspection?]
+	>=x11-libs/gtksourceview-3.17.7:3.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3 )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	use python && export PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable python python-pack-plugin) \
+		$(use_enable vala vala-pack-plugin)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" Xemake check
+}
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@ -1 +1,2 @@
 DIST gnome-calendar-3.16.2.tar.xz 2226324 SHA256 b530e1de58f3e3db9ab1470ee5f2bbb72b5aedca0d127cf093c8416e90be1c6f SHA512 28777a2e87e519392b3f90f225c8450dab52e8cc1d4793820316b3ca2e681d924629e2621a88a3e4d198673a7ec5f548fb99b2e0a5915a6c3b10195849467727 WHIRLPOOL 63f61f2b779c1890fb236af902944ba21a9de00fdc7b5656eba289ad714215b6ecefb8ae5cc21097089d3a47649aadc4828bcb9fd29ee036dba4388d2dbd5ccc
+DIST gnome-calendar-3.18.1.tar.xz 2287668 SHA256 96f307c79952fa55bfdfc2b256085c568384dde2312b2815ee5e8e21e6adf2b9 SHA512 ba8e5b3d5cab84d51f87dfc6ef4ab3b9e334391f791a1836a430459b21f1834518d751d932302a9d3764d1a130c55fc1a1c11c6c92bc762bb3d08f1bf9d514d6 WHIRLPOOL 3139eabd280ff7bfe30d939f0702ebf84204b1773482a62cf0411a6e6dea0c18742efb4c30062c09d980aa755aa06ac7e7d975ace2b8b0e7316f21768c992a6e
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/libical-1.0.1
+	>=gnome-extra/evolution-data-server-3.17.1:=
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=x11-libs/gtk+-3.15.4:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.40.6
+	sys-devel/gettext
+	virtual/pkgconfig
+"
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@ -1 +1,2 @@
 DIST gnome-characters-3.16.2.tar.xz 1364196 SHA256 84616563f3c6c381bcbf5e059ed603f422af9775f744b19826f1ca4ac59845bf SHA512 0809f77bfcc173984fc45476f9766b4a3917247ab5d4cb957169b192eb5648a34bf73525c51a5f94681929d18d586f4e890f063df24395c65bde50344205d19e WHIRLPOOL 47cea0477e9a9fda228f07c3171c4c3427beeda977e559c17d9d7a4654791e444c74d0c5e2a552f10f726218e7cc4d9b1efe38fa7fee6d25556560c3eea1255d
+DIST gnome-characters-3.18.1.tar.xz 1358396 SHA256 161839bb6c1ffca78b6c11b8d4f3f32b8263705911df0aed3268672c050b9bac SHA512 c26808eff240fa6c89768c7a7aa1ccacada5fb732a18d004842cf927cd0bea3da9816fd1d1bd243bde70e668d3c6cb0fba6e3fb922b3d337eb0583a30140b4a9 WHIRLPOOL a02417286025ef5333e642c7b98f9c6c594e0f576d9fed8b8dcd15483f5eccd51506b241496bdfe6e35dd37763f43f79ffc7afa1940130f20b57a53bd79df4a5
--- a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/gjs-1.43.3
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3:3[introspection]
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-util/dogtail )
+"
+
+src_configure() {
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check
+}
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@ -1,2 +1,2 @@
-DIST gnome-clocks-3.16.1.tar.xz 871648 SHA256 1804bac40d95044d43d6c04762dd2a0785f8783b38d9393290c31face083f3cc SHA512 bb41051259786f30e96c4551473f789c980ddcd39f10a7921c727068778464590c459a8a129740d1bc89a080c615e16429aa5287ee7b2570f3ce1fd4905a1853 WHIRLPOOL d21f9261e149c4f3a4ade4dcfc4e95bbbc7a3c11f3c899ab19ae6c5987d2cba599a35506005f93e08e6d19fac9e2ad4f21d2787faa73ff4e84d87c9c479c39c0
 DIST gnome-clocks-3.16.2.tar.xz 872816 SHA256 cdfa74a02796cfea001826647754aaaa57d10e3e91e93301f16a59e538679e98 SHA512 3a137c3b68b3fa54353f8664ea1b5825cad5126cecf0f408e479bcdefd35404d79ce3c194565e0c77de1b707f7471b8f41c0a93c793f4619394f2619b736ebc6 WHIRLPOOL ab3276d3b68e28e41d467f8747480f98ed17c9650b7291aaa6f6466af2f3d3dc48583e9933a2522df2e1bcdd7e2782f1bbe88298d6c4e33036f8608a1f8dd43e
+DIST gnome-clocks-3.18.0.tar.xz 870864 SHA256 ca0818ec89e3539201da6b5388365e3d66df815198beccc90e2be44c7822baa0 SHA512 70e0b21c9dbacc4ad74150724dcde038737ad4bbb38d76c2ac18b07d6afcfc7c60a34224de684f8cb52e3f621ff533872c5b423953ac3ba726511d6eb9b348d7 WHIRLPOOL 82f8ce77aa8e28df3d0481c0e35282d2156b4c9c3e1e5266e1a9bc120bf59710ee1cc29694d53d21dd2e8cb704f1779e4287a64b2cc592e0a670e6cacdd07d9a
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
@ -9,11 +9,11 @@ VALA_MIN_API_VERSION="0.24"
 inherit gnome2 vala

 DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://live.gnome.org/GnomeClocks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""

 RDEPEND="
@ -28,6 +28,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	$(vala_depend)
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
@ -36,7 +37,3 @@ src_prepare() {
 	vala_src_prepare
 	gnome2_src_prepare
 }
-
-src_configure() {
-	gnome2_src_configure ITSTOOL=$(type -P true)
-}
--- a/gnome-extra/gnome-clocks/metadata.xml
+++ b/gnome-extra/gnome-clocks/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@ -1,3 +1,2 @@
-DIST gnome-color-manager-3.12.3.tar.xz 2618564 SHA256 ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039 SHA512 991f2e98f60255ad28fb05d616ea0ac970cdc51558bd33ded5a89ab792f5c807f689c1a3ca4de4ae260a5e399afe75dac7c05b897423bf9a1052533452b8f555 WHIRLPOOL e310e478c93b158f21606e36b17e00f86ddfff05ff86655404fdccd88c43cf29ed96de0a731cb70ec29d440cc3bc3a43461767b25942cdfffba5ef3af80aec1e
-DIST gnome-color-manager-3.14.2.tar.xz 2630640 SHA256 a2fa17f17c1c7259dbf6f042b7adf2816a7ba54747706e1b245bcd6d6274eeef SHA512 662a35a841c410cedcb797187ceb6fa2abf2329822dd787d4c97aa97225d7a31899551f9425c59b7bc0a4f426c9f908d8d3d02c1111691991a92c42923df39af WHIRLPOOL c4a171baa678c9f5075c5d490fd72122ad9b92a19405dd7e770f2b311bab1d23256e7b9ce15d72e3f7dda703692076ed1318cb9cc108c96f3a3121fc9ad7b885
 DIST gnome-color-manager-3.16.0.tar.xz 2632592 SHA256 408890ae1d15cff6385b61b61e1a2de0b4236ef706eddd96181b227fda1daf0f SHA512 cdd6c2170d3335610cc32250ccd6c214e700e5f27d211757730e1b3a794d6651ec3b06bbae3b3e2782a784c175b4666d3b4761b47ebaecced84667d6c8dbaa4d WHIRLPOOL fd51703609f4a6d7125cc07c08cf96b0cf0d206a7299996d5885c4494f2311d2a2f2c9bb494007440f9beecb43a96d0d73561091f69e52368dfc740c269c3215
+DIST gnome-color-manager-3.18.0.tar.xz 2647648 SHA256 83d06f3b76b89b6c56bd6e4f792e15c67b561682fa9d59b60cbf716f6130a435 SHA512 4f1259681ee5f3762b1e4212e7b48c2caaa371d5cec00aa1ee4506f908310c8bbe4ff3e05e857707573475bfae0e61364d72c2d942d1d3fe5d978d2ca02c627c WHIRLPOOL 24e90187d17591450ac23da6afce3736e9380c2be75f0e3e7c470cebd5c849e8a40adf697cf42cc9269c419190379395d450fbe4a60eace40e16fe5ecf3ad8ae
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.90
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )
-"
-RDEPEND="${COMMON_DEPEND}"
-
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	gnome2_src_configure \
-		--disable-static \
-		--enable-tests \
-		$(use_enable packagekit) \
-		$(use_enable raw exiv) \
-		ITSTOOL=$(type -P true)
-}
-
-src_test() {
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="packagekit raw"

 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="packagekit raw"

 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
@ -40,6 +40,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/appstream-glib
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35
+	dev-util/itstool
 	virtual/pkgconfig
 "

@ -51,8 +52,7 @@ src_configure() {
 		--enable-tests \
 		$(use_enable packagekit) \
 		$(use_enable raw exiv) \
-		APPSTREAM_UTIL=$(type -P true) \
-		ITSTOOL=$(type -P true)
+		APPSTREAM_UTIL=$(type -P true)
 }

 src_test() {
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@ -1 +1,2 @@
 DIST gnome-logs-3.16.2.tar.xz 624624 SHA256 e139a3c24c850074157fa637fe1449c5279966c48fc2dd223aa61518f792621c SHA512 6cd1e644c57d10102c541f4e4d28992f14cb5ab46bb5ad7c71eea6458bc5b0839fbf8b435f0991299e921c2479642b3c38031717d5b4b14831c990130ecc49f6 WHIRLPOOL a642dc593ffa0a1cf8c22845b35268ee70b6c983d0e7b4e88244448348a3ee2e88b424b5e0f74d4ce37066f49249c316b18b17e25557063ee5c57050ad2a39c3
+DIST gnome-logs-3.18.1.tar.xz 854700 SHA256 3ccbd74e61af13b9ab4f8a45df9c0ff84b7c06a7baccf2150601a82b6dd662dc SHA512 6976a931441cc82b8b87d34d3e757545055d9b1f25107e6001b774693d4be019365ccceaf27d4bb79766e028d9d58ccda87fcdb40344fec78912aae426e9c899 WHIRLPOOL 5d19dd2ccbc1f94ffb562540624270e6d0c0497594abbfdacb41a998bcf28332067382dd22ce223c35e2a337d7d0a3633d205d798edce1b1595fa45a24da93d0
--- a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.43.90:2
+	sys-apps/systemd
+	>=x11-libs/gtk+-3.15.7:3
+"
+DEPEND="${RDEPEND}
+	~app-text/docbook-xml-dtd-4.3
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+"
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@ -1,2 +1,2 @@
-DIST gnome-power-manager-3.14.1.tar.xz 469568 SHA256 07790a9e8274fe950a6dd653a4e2f4a0f52cb9d89eb9d5320fa6e1b3b3aa9624 SHA512 4089cb3a35e96ac3566adbb2a0905efa048b80794643ca1d979d7208e9f06b9de94b55cad0da36805765d37e5e25727b2baf59af9dc6ea6b515a95600ec69db4 WHIRLPOOL a6d8ed9e42cdec053dfd09c6eb324d03c603278544b35f4b9f98da0c9aef60cfb6d23048bb2d3fbdbfe9766c17941bab16d1eca257328495073e813011914c69
 DIST gnome-power-manager-3.16.1.tar.xz 432360 SHA256 a4177dbff9fac1f1babf0d2715f950ee0fa3dd143d7b5d89311f33afca924231 SHA512 b4f04196f88bb43eaefc910e733cb291fd88c260baae275595fa1e9913ccb2577ea2192238c6bf18297c4cc69b0d0e88571b96ee526f37ad260f6e1b429488da WHIRLPOOL 41841940544807974d8497f0cecd8a20b4b8f18a4bc30155ba9893d45553ac57cc3ee206bc162132933aef6343a19ca30572fe36b7af6d422aef6e7d63c208ee
+DIST gnome-power-manager-3.18.0.tar.xz 433960 SHA256 afe5921a4313d15757f39f6ff4ec6f7c9e9cbb9b2aaa0b8a290e1cd7557e28f0 SHA512 53ec940882b1b037e5d32bcda72b34582925608df30f96147b975651f26cde268a608bbc55242bfee67a48950fa0c395f6b893c047e6b4f1a1c45793376d9b44 WHIRLPOOL 05492c60557744fb86c92c4d47cc54a4b37b7d6ad1eb1701fa2d68acc9a39e3a9a69c3dec96efc0b306d7ba40a54d94da3d3c265cc2d6b643ae0964b4b211326
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"

 COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
@ -13,10 +13,10 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"

 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
+	>=dev-libs/glib-2.45.8:2
 	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/cairo-1
 	>=sys-power/upower-0.99:=
@ -27,8 +27,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-dtd:4.1
 	app-text/docbook-sgml-utils
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/scrollkeeper
+	dev-libs/appstream-glib
 	>=dev-util/intltool-0.50
 	sys-devel/gettext
 	x11-proto/randrproto
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@ -1,2 +1,2 @@
-DIST gnome-user-docs-3.14.2.tar.xz 14526736 SHA256 ee89e0891fcad30ceb9e93e57a40e59730e0fee7973be233e0c4992b1d5726f1 SHA512 a584fbc282fb167fb23a8b1a0327bcfe90450402241d0cfe510b90de3c2362f665e2ff25ac73fae10063ae23ffa03c8555118cc28a720e8e31646c732ea8b54e WHIRLPOOL 0a5b8d1f96c4aed2b315faaf3ac863ed1633665b6be7c10e1d297cb0f7ce1b1fbc859072b07db9712de05a0f5bf80a6603fa5cff59f9f89a229151181a863db1
 DIST gnome-user-docs-3.16.1.tar.xz 14174340 SHA256 9678f8ec22f4ead58c0a6f1c8886d6ee5bda696962b393acc2e6ab742d4c9331 SHA512 4892daac35469a46551833f327f2a7ff5b2b8e7361d223300c6cea7ab1f710760d697aa6f5a524768aed1b10402d00c8a6df371a7aa5c1988bb8ac7b274f666f WHIRLPOOL 07525cce41000fff351bc466383c5baff09d1ffda469d5bd143fcdbf60cae3c5ac8a4b564307acb02a417b990ca18ecf8159e57150a25e6f21790d15269c29dd
+DIST gnome-user-docs-3.18.1.tar.xz 14213948 SHA256 83e52528de6afe4412679d7fd8c7f8124b07770b4e291592f24e9e50657efae4 SHA512 161fd15f852d5cc2dbffec304d6ab09ae92cd7ff0d457194acd40e530ca34a3b49fa23a6b51542676b53045ea2c7726b2f328a11e295dbc0d13da60b1ff622e0 WHIRLPOOL 855ef6926c1ac89b59910d66a38afa48a6dcc34486bec1c441990e94e379a5d91b806c27ba58b5b116f840149c44fd8ab5743c20716f72422e2c2814d97cebcc
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"

 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="test"

 RDEPEND=""
--- a/gnome-extra/gnome-user-docs/metadata.xml
+++ b/gnome-extra/gnome-user-docs/metadata.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@ -1,2 +1,2 @@
-DIST gnome-weather-3.14.1.tar.xz 10520072 SHA256 e3acea9b5e9e7dd5e9d51c2793c568ea7378b08b4de1bcfe7f0b8b3c2004fe87 SHA512 e167fe07aacc0af8aa30ee40f8aca83e735ddc3c7278b221f09fecc82d513f90250e6079425dc04d4ae865a4a265753b9332234795326a84d7b3b1a228f4afa1 WHIRLPOOL 69a9f3ed5a947f3e4f681c9aa8c6a73f772b4496401a61456e33173cf23ebc34fd8a0711aee6bef889c7077c9cb6141e7036de454356ca9932f7b5d13210eca2
 DIST gnome-weather-3.16.2.1.tar.xz 10344692 SHA256 0fe481d4be192ca32cb401f3f4b74feb0f1ea3241f23dc51ec1949874836e355 SHA512 a4adb392da018cd4033416ae4d4e481a025455fab69213db9ab7fa42add635e87b9ed846bfa69dfdda591fb0ee58cd63c7486b74659f14e23b1bcd97f4d13e8d WHIRLPOOL 30ce35737658507b6d37cdc6e64a736a81ff0869ec9b48dbca094c1da25f622095411a6f67af731f4d68354b352d69e584c841c89b4abafc7fcafcb1e916cdbb
+DIST gnome-weather-3.18.1.tar.xz 5358172 SHA256 d0cbe0ee6e9f9332e30836d72c9a462ecc908a97402943c33cd6e61d08323fdf SHA512 1e04fd932edfb15c16965a17a4865689c7133408b9d05a3e67e3c0dda77b1daf8a027603f66cff85957376626f4ad3d66ac9d28efb0f964667889b894cb66e1c WHIRLPOOL 8efd62cbb789dba43561e59489c9cf951b81bcde8490619a88f4bed850f9365d0c54321820260f1091d0e7f18cc162aafd98834bda096faa6da94d9956fe3be5
--- a/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
+++ b/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
@ -1,59 +0,0 @@
-From 7c901f42d2837e682f37d85b1fa3ee94922f2a05 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Mon, 13 May 2013 21:19:49 +0000
-Subject: Add a submenu to the app menu to choose the temperature unit
-
-Among all the preferences in the old dialog, temperature unit
-is the only one that makes real sense, as we don't show wind
-speed, visibility or pressure.
-Also, exclude the Kelvin entry, which is there just to make
-cool screenshots :)
---
-diff --git a/data/app-menu.ui b/data/app-menu.ui
-index 42a16a4..c332595 100644
--- a/data/app-menu.ui
-+++ b/data/app-menu.ui
-@@ -6,12 +6,25 @@
-         <attribute name="action">win.new</attribute>
-         <attribute name="accel">&lt;Primary&gt;n</attribute>
-       </item>
-+    </section>
-+    <submenu>
-+      <attribute translatable="yes" name="label">Temperature unit</attribute>
-+      <item>
-+        <attribute translatable="yes" name="label">Celsius</attribute>
-+        <attribute name="action">app.temperature-unit</attribute>
-+        <attribute name="target">centigrade</attribute>
-+      </item>
-+      <item>
-+        <attribute translatable="yes" name="label">Fahrenheit</attribute>
-+        <attribute name="action">app.temperature-unit</attribute>
-+        <attribute name="target">fahrenheit</attribute>
-+      </item>
-+    </submenu>
-+    <section>
-       <item>
-         <attribute name="action">win.about</attribute>
-         <attribute name="label" translatable="yes">About Weather</attribute>
-       </item>
-    </section>
-    <section>
-       <item>
-         <attribute name="action">app.quit</attribute>
-         <attribute name="label" translatable="yes">Quit</attribute>
-diff --git a/src/main.js b/src/main.js
-index 687b79e..844a0d4 100644
--- a/src/main.js
-+++ b/src/main.js
-@@ -76,6 +76,9 @@ const Application = new Lang.Class({
-                          [{ name: 'quit',
-                             activate: this._onQuit }]);
- 
-+        let gwSettings = new Gio.Settings({ schema: 'org.gnome.GWeather' });
-+        this.add_action(gwSettings.create_action('temperature-unit'));
-+
-         this._initAppMenu();
- 
-         this.add_accelerator("Escape", "win.selection-mode(false)", null);
--
-cgit v0.9.2
--- a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
@ -5,30 +5,34 @@
 EAPI="5"
 GCONF_DEBUG="no"

-inherit eutils gnome2
+inherit gnome2 virtualx

 DESCRIPTION="A weather application for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"

 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="test"

 RDEPEND="
-	>=dev-libs/gjs-1.41.4
+	>=dev-libs/gjs-1.43.3
 	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9
-	>=dev-libs/libgweather-3.9.5
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libgweather-3.17.2:=
 	>=x11-libs/gtk+-3.11.4:3
 "
 DEPEND="${RDEPEND}
-	dev-util/appdata-tools
+	dev-libs/appstream-glib
 	>=dev-util/intltool-0.26
 	virtual/pkgconfig
+	test? ( dev-util/dogtail )
 "

 src_configure() {
-	# dogtail is not packaged in gentoo
-	gnome2_src_configure --disable-dogtail
+	gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+	Xemake check TESTS_ENVIRONMENT="dbus-run-session"
 }
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@ -1 +1,2 @@
+DIST gtkhtml-4.10.0.tar.xz 1050628 SHA256 ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3 SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0 WHIRLPOOL 2c4e2bbb97d31b751ebd05a9f2e898ac1ce5242826d025978f878e9a6e3266aff32e6256f42eb05007d3a9c13f05347029b9c9d4a67eb78789762a7163cd1d33
 DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
+HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+# orbit is referenced in configure, but is not used anywhere else
+RDEPEND="
+	>=x11-libs/gtk+-3.2:3
+	>=x11-libs/cairo-1.10:=
+	x11-libs/pango
+	>=app-text/enchant-1.1.7:=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/iso-codes-0.49
+	>=net-libs/libsoup-2.26.0:2.4
+"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	sys-devel/gettext
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't collide with 3.14 slot
+	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
+}
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@ -1,2 +1,2 @@
-DIST sushi-3.12.0.tar.xz 281976 SHA256 78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff SHA512 909cf9f820a1e78f1a74d08a152e6ad4713d25d4043be3c76739f73422764fbceb843ae083948cb1f7e7d862f011881087fe3ef4a4ee3afeeec47513bcf8dec2 WHIRLPOOL de3ddd9055ed664741846ab0de80d34803a0560d4ed5ecaaf2812d437d2f078dcae021cf8d3b6ebe68e3b38ae342b91b7dccb25b7391caed5477a7299e734b76
 DIST sushi-3.16.0.tar.xz 282588 SHA256 86c4e22b374514492334b5fcca6f170d328dae77cfcc0acd357c5426600b0034 SHA512 7938aa5457fa05f806c68ca28365a93236465737293fef1efa0a2435db6e95f347f0524a086435306ecb2a90fd9a93c2f01b2f6523afb5ddf8d2a6c1380e4165 WHIRLPOOL 76f154bc0a139c660cc23ca1d17c2b73344ce0ac274466286e885e004c7ef8939768bd2e473b1a6bfedc720f1dab85fd7d2be9869e31b79fe077bf588b9c0cb9
+DIST sushi-3.18.0.tar.xz 294676 SHA256 7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c SHA512 9243486a10302f312c45e39496803d74d00d2121b80e813cf4c8c01a25c14dfbc0fba72cdcc6b2d72127c1c15d8415ecaa4ae0b7ee892c69f1dea9407cbaaf61 WHIRLPOOL ac9c13d8ce47c35d53b09d6a187fc44eb55630bcf396682ed94391b4a9874f65fed86b36296044660acbb92330bf05e8e66af6e338db666691dced92df18c7cc
--- a/gnome-extra/sushi/sushi-3.18.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.18.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="office"

 # Optional app-office/unoconv support (OOo to pdf)
@ -22,10 +22,10 @@ COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.23[introspection]
 	>=dev-libs/gjs-1.40
 	>=dev-libs/glib-2.29.14:2
-	>=dev-libs/gobject-introspection-0.9.6
+	>=dev-libs/gobject-introspection-0.9.6:=
 	>=media-libs/clutter-1.11.4:1.0[introspection]
 	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection]

 	>=app-text/evince-3.0[introspection]
 	media-libs/freetype:2
@ -33,7 +33,7 @@ COMMON_DEPEND="
 	media-libs/gst-plugins-base:1.0[introspection]
 	media-libs/clutter-gst:2.0[introspection]
 	media-libs/musicbrainz:5
-	net-libs/webkit-gtk:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
 	x11-libs/gtksourceview:3.0[introspection]
 	x11-libs/libX11

@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/nautilus-3.1.90
-	x11-themes/gnome-icon-theme-symbolic
 "

 src_configure() {
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@ -1 +1,2 @@
 DIST yelp-3.16.1.tar.xz 1416752 SHA256 60810b8ddf5d2bf525a70a80a982af5053db061e0d823ed883d3671d9a5267ca SHA512 bfbce5c86dd6ee6d95cd4fc14acf8285616f4aef52b14d0b68f6844fbdad17631c84c2bc029e7ee0599055c00dd8599bf20341686290060b8c27ffddc2265103 WHIRLPOOL bab7e1f4297bcef0896a497c3d2a8d016405a77f77ae9810c80425dfb7234f018e6eb4688f2c408e9a71408684d107fef4de113bb007a0fe7f0850ba4d6a6e87
+DIST yelp-3.18.1.tar.xz 1386044 SHA256 ba3a4eb4717c0ecf4a2e40eff0963fcd12c700c4fb80b83ecaad8b7032256880 SHA512 ebff55bb3eb0caad208abfad3d83fa996d63bb97647ff446d25590b5c84d341161f3fdb9987353bd55e73ef2634baa692928fbc21b4ed16b6070500228fc2425 WHIRLPOOL 2f7479641bea73e248508a51e056eb33c9e3c30994017b8c17dfb0153a71f6174152aa8c05dd76fbb4bcc06b72a92bbc1fc46a7c10b19c3b5a62d597390aa3f5
--- a/gnome-extra/yelp/yelp-3.18.1.ebuild
+++ b/gnome-extra/yelp/yelp-3.18.1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.12
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	epatch "${FILESDIR}"/${PN}-3.16.0-man-compatibility.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma
+}
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@ -1,2 +1,2 @@
-DIST zenity-3.14.0.tar.xz 3686756 SHA256 6b57ec6c456af17714dc366e63dabb8bbe0577878b61907805f0186d4d2b892f SHA512 2cb6a0649f5fc6eb6f5ebfbdc4eb6feee4fdc06849783bd8b4879a073a13451ec41a8633c086bde6c8b68afe649f7da0ca65581f263507a2b05708af752d48d8 WHIRLPOOL c14c7d38bb4fc2dbcf0e304170a736f7ff4cefe5ef9f7f8512744cdfe6c1896c4c1e7ff0bae7d529f5050d8081fe86f9ec7e95d54471f32252b36ef6c081984c
 DIST zenity-3.16.3.tar.xz 3878596 SHA256 7fe28016fbc5b1fc6d8f730d8eabd5ae2d8b7d67c8bfa0270811ff0c2bfb1eba SHA512 67da24e56b529fda5c9163cd2d2e68a74cf45434ced929da2ca52909bfcdf264d6e9394947c0a129e0ace08e472765d7bedbbfdfab78b10fe69d78c237d45caa WHIRLPOOL 34ba92009792095c51ab5d81e617e0924bd6e06a49bf1681508512de5ca5649e192f8e4c9d13c132188bfa5414aeefeac0215ddc4a4ec6ccc218b6e0139b22d1
+DIST zenity-3.18.1.1.tar.xz 3880932 SHA256 e6317a03f58b528e2e3330fef5acea39506ec08a7c2aeec5c4f1e7505d43a80a SHA512 fdadf8ed4e135d24401bcd17121f10681e12572391d843f6510347a6c9c568e23e0ff7fb3f80f0bbc0ffd6698b149faac547c1b99ac423229e6f491e2751e06a WHIRLPOOL 9b37707d56e52c6c7ff877996624afb4c642fb5544799a33cee9ace386cfdbea766d08f55814f1a976cac2ca77ce404d8b18c1d3d08b4c27b2a03d53a19e763b
--- a/gnome-extra/zenity/zenity-3.18.1.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
@ -12,8 +12,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"

 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="libnotify test +webkit"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="libnotify test webkit"

 RDEPEND="
 	>=dev-libs/glib-2.8:2
@ -22,11 +22,11 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/pango
 	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
+	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.14
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
 	test? ( app-text/yelp-tools )
 "
@ -39,11 +39,12 @@ src_configure() {
 	gnome2_src_configure \
 		$(use_enable libnotify) \
 		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false) \
-		ITSTOOL=$(type -P true)
+		PERL=$(type -P false)
 }

 src_install() {
 	gnome2_src_install
+
+	# Not really needed and prevent us from needing perl
 	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
 }
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@ -1,2 +1,2 @@
-DIST gnome-screenshot-3.14.0.tar.xz 259796 SHA256 d96f108421ab04ee5d26387387df3858764e61d7718c7376cbf87890bf33912a SHA512 b8ccdc9db548824eb6e7bc7c783c429363a510921c2187d5daa3f83cfda202a3a0e447db1cb49649940add84e4e404c2a821f96ec3e895e0fc3f549362bf79a3 WHIRLPOOL a2347d6509336d9872557a6db29657d15ecb22a642b5d2c20836b4f32559f166617e620f77676a67703a939a515e2ef4d1e5e1c793ba588e8dd915300c11ea58
 DIST gnome-screenshot-3.16.2.tar.xz 279828 SHA256 5dd4bafb3deb0967866726ba89dab62bbd6dc3bda3b190474281142aa3dee948 SHA512 98092e2779cc6fa67a40a2318c1f5637ac948f0c1c933552b66483230c9b17751f88082a2812635121b09af06a6e3e98e0f6f69aba97ebc8bfd4cd55d7d50135 WHIRLPOOL fc7d5e5f88fb78e400459685b1c65dbd07f3908471368aa15714ff41825c565f02285a101dc2b3ba2cf978e9fb2247c43a3d67cb3681a711639cf99a9928944a
+DIST gnome-screenshot-3.18.0.tar.xz 281752 SHA256 eba64dbf4acf0ab8222fec549d0a4f2dd7dbd51c255e7978dedf1f5c06a98841 SHA512 82d6e958cbc485587d07454f8acccddff1b62880ce102299ae570cf436844296f0338056995a6b8242009c0106feb95b85e7b01dbe1feef9b1b74f095b857f9d WHIRLPOOL 523fb518357ff00d001e2fe9e101cb68272f3c4278ff1f4340d5ecbe82ce428089e3db8ad38b43f8973a308520e5c27e55459fd583ae36ea6595a8e479b749aa
--- a/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
+++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
@ -1,23 +0,0 @@
-From aa23783c39f96dd0b45f70d82557736a5b884c55 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Wed, 28 Jan 2015 12:43:58 +0000
-Subject: filename-builder: use dash for time format separator
-
-We can't use colons, but a separator here still looks nice. Use a dash.
-
-diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c
-index 06706d6..5eade9c 100644
--- a/src/screenshot-filename-builder.c
-+++ b/src/screenshot-filename-builder.c
-@@ -130,7 +130,7 @@ build_path (AsyncExistenceJob *job)
-       GDateTime *d;
- 
-       d = g_date_time_new_now_local ();
-      origin = g_date_time_format (d, "%Y-%m-%d %H:%M:%S");
-+      origin = g_date_time_format (d, "%Y-%m-%d %H-%M-%S");
-       g_date_time_unref (d);
-     }
-   else
-- 
-cgit v0.10.1
-
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"

 # libcanberra 0.26-r2 is needed for gtk+:3 fixes
 COMMON_DEPEND="
@ -40,12 +40,6 @@ DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
 	non-interactive mode when launched from a terminal. If you want to choose
 	where to save the screenshot, run 'gnome-screenshot --interactive'"

-src_prepare() {
-	# filename-builder: use dash for time format separator (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.14.0-use-dash.patch
-	gnome2_src_prepare
-}
-
 src_install() {
 	gnome2_src_install
 	readme.gentoo_create_doc
--- a/media-libs/libpng/libpng-1.2.54.ebuild
+++ b/media-libs/libpng/libpng-1.2.54.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"

 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""

 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
--- a/media-libs/libpng/libpng-1.5.24.ebuild
+++ b/media-libs/libpng/libpng-1.5.24.ebuild
@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz

 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"

 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
--- a/media-libs/libpng/libpng-1.6.19.ebuild
+++ b/media-libs/libpng/libpng-1.6.19.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz

 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Sun, 15 Nov 2015 08:17:44 +0000
+Sun, 15 Nov 2015 12:18:12 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Sun, 15 Nov 2015 08:17:44 +0000
+Sun, 15 Nov 2015 12:18:12 +0000
--- a/metadata/md5-cache/app-emulation/libvirt-1.2.20-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.20-r1
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen elibc_glibc
+IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/1.2.20
 SRC_URI=http://libvirt.org/sources/libvirt-1.2.20.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	8644194de7be04932084752fb1327080	libtool	7f78cd7d403808a350c9ae23f5821fb4	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	readme.gentoo	e37aea783a61ae55fab947df247eebea	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d8ef33a5471d76195296cd9b55289fbe
+_md5_=bc6fe4b3ea5fde01b3cd6e9b3dc8071d
--- a/metadata/md5-cache/app-emulation/libvirt-1.2.21
+++ b/metadata/md5-cache/app-emulation/libvirt-1.2.21
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=5
+HOMEPAGE=http://www.libvirt.org/
+IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/1.2.21
+SRC_URI=http://libvirt.org/sources/libvirt-1.2.21.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	8644194de7be04932084752fb1327080	libtool	7f78cd7d403808a350c9ae23f5821fb4	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	readme.gentoo	e37aea783a61ae55fab947df247eebea	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bc6fe4b3ea5fde01b3cd6e9b3dc8071d
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=5
 HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen elibc_glibc
+IUSE=apparmor audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux systemd +udev uml +vepa virtualbox virt-network wireshark-plugins xen
 LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )
+RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 >=net-libs/gnutls-1.0.25 net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) lxc? ( !systemd? ( sys-power/pm-utils ) ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) openvz? ( sys-kernel/openvz-sources:* ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl !systemd? ( sys-power/pm-utils ) ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) systemd? ( sys-apps/systemd ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	8644194de7be04932084752fb1327080	git-r3	1502b9838d043db47700b8120083e637	libtool	7f78cd7d403808a350c9ae23f5821fb4	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	readme.gentoo	e37aea783a61ae55fab947df247eebea	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d8ef33a5471d76195296cd9b55289fbe
+_md5_=bc6fe4b3ea5fde01b3cd6e9b3dc8071d
--- a/metadata/md5-cache/app-emulation/spice-0.12.6
+++ b/metadata/md5-cache/app-emulation/spice-0.12.6
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=app-emulation/spice-protocol-0.12.10 virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( dev-lang/python:3.4 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) client? ( media-libs/alsa-lib >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext >=x11-libs/libXinerama-1.0 x11-libs/libXfixes x11-libs/libXrender smartcard? ( app-emulation/qemu[smartcard] ) )
+DESCRIPTION=SPICE server and client
+EAPI=5
+HOMEPAGE=http://spice-space.org/
+IUSE=client libressl sasl smartcard static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.22:2[static-libs(+)?] >=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?] media-libs/opus[static-libs(+)?] sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] !libressl? ( dev-libs/openssl:0[static-libs(+)?] ) libressl? ( dev-libs/libressl[static-libs(+)?] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) client? ( media-libs/alsa-lib >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext >=x11-libs/libXinerama-1.0 x11-libs/libXfixes x11-libs/libXrender smartcard? ( app-emulation/qemu[smartcard] ) )
+SLOT=0
+SRC_URI=http://spice-space.org/download/releases/spice-0.12.6.tar.bz2
+_eclasses_=eutils	8644194de7be04932084752fb1327080	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-any-r1	60a62ae0ee8cd93b4ba99a4c1371eb8b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=1a699dd82273f3db819302c8d8f74f46
--- a/metadata/md5-cache/app-emulation/spice-protocol-0.12.10
+++ b/metadata/md5-cache/app-emulation/spice-protocol-0.12.10
@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Headers defining the SPICE protocol
+EAPI=5
+HOMEPAGE=http://spice-space.org/
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://spice-space.org/download/releases/spice-protocol-0.12.10.tar.bz2
+_md5_=d97c0f635134ac12023d301826f10f45
--- a/metadata/md5-cache/app-text/dblatex-0.3.7
+++ b/metadata/md5-cache/app-text/dblatex-0.3.7
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/texlive dev-texlive/texlive-htmlxml dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathextra dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg 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(-)]
+DEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathextra dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Transform DocBook using TeX macros
 EAPI=5
 HOMEPAGE=http://dblatex.sourceforge.net/
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-text/texlive dev-texlive/texlive-htmlxml dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathextra dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg 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(-)]
+RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathextra dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.7.tar.bz2
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	8644194de7be04932084752fb1327080	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=3b0fa73607f5d047d8cc4146140a4399
+_md5_=64ce7aa8bb13f6b531811447afe2858b
--- a/metadata/md5-cache/dev-db/mycli-1.5.2
+++ b/metadata/md5-cache/dev-db/mycli-1.5.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=CLI for MySQL Database with auto-completion and syntax highlighting
+EAPI=5
+HOMEPAGE=http://mycli.net
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT
+RDEPEND=>=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/configobj-5.0.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pygments-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] =dev-python/prompt_toolkit-0.46[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pymysql-0.6.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-sqlparse-0.1.16[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/dbcli/mycli/archive/v1.5.2.tar.gz -> mycli-1.5.2.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	8644194de7be04932084752fb1327080	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=e2262ef00b0754e5bb3e0dcd5471b241
--- a/metadata/md5-cache/dev-games/crystalspace-2.0-r1
+++ b/metadata/md5-cache/dev-games/crystalspace-2.0-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg:0 ) bullet? ( sci-physics/bullet ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) dev-util/ftjam dev-lang/swig virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0 ) !<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=Portable 3D Game Development Kit written in C++
+EAPI=5
+HOMEPAGE=http://crystal.sourceforge.net/
+IUSE=3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png speex truetype vorbis wxwidgets elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm sys-libs/zlib cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( <dev-games/ode-0.12 ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg:0 ) bullet? ( sci-physics/bullet ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng:0 ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/crystal/crystalspace-src-2.0.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	8644194de7be04932084752fb1327080	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	a96633177f44ee992b3fce360d1c4f16	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	2a19d3cd9b18703ae9fb53123722061c
+_md5_=b36ea1e9cbeccceae442b0bf390e6017
--- a/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.2
+++ b/metadata/md5-cache/dev-java/icedtea-bin-7.2.6.2
@ -7,10 +7,10 @@ IUSE=+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio seli
 KEYWORDS=-* ~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2-with-linking-exception
 PDEPEND=webstart? ( dev-java/icedtea-web:0[icedtea7] ) nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )
-RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/nss-3.16.1-r1 >=dev-libs/nspr-4.10 >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.3:2 >=media-libs/lcms-2.6:2 >=sys-devel/gcc-4.8.4 >=sys-libs/glibc-2.20 >=sys-libs/zlib-1.2.3-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1 media-libs/libpng:0/16 >=x11-libs/libX11-1.6 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.2 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.12 >=x11-libs/cairo-1.12 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
+RDEPEND=>=dev-libs/glib-2.42:2 >=dev-libs/nss-3.16.1-r1 >=dev-libs/nspr-4.10 >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-devel/gcc-4.9.3 >=sys-libs/glibc-2.21 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) !headless-awt? ( >=media-libs/giflib-4.1.6-r1 media-libs/libpng:0/16 >=x11-libs/libX11-1.6 >=x11-libs/libXext-1.3 >=x11-libs/libXi-1.7 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXtst-1.2 ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0 app-eselect/eselect-java
 REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
 RESTRICT=preserve-libs strip
 SLOT=7
 SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-7.2.6.2.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-7.2.6.2.tar.xz ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.2-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.2-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.2-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.2-arm.tar.xz ) ) ppc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.2-ppc.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.2-ppc.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-7.2.6.2-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-7.2.6.2-x86.tar.xz ) )
 _eclasses_=eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	82eb4c2a4b43108087d4d92d34d2bd0f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	pax-utils	9dd3f9de6dccb2463faf55e568439d1c	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=058ac3f445a1a0d787b1a7084051c73c
+_md5_=4c69111c3d32e8a3fcd4165c154c667f
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.12
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.12
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libgit2-0.20.0:= <dev-libs/libgit2-0.21 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Git library for GLib
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python python_targets_python3_3
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libgit2-0.20.0:= <dev-libs/libgit2-0.21 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_3 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.0/libgit2-glib-0.0.12.tar.xz
-_eclasses_=eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1dda2f98958395bda4ef212e285d2cd6
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.16
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.16
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libgit2-0.21.0:= >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Git library for GLib
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libgit2-0.21.0:= >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.0/libgit2-glib-0.0.16.tar.xz
-_eclasses_=eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9109cd6282de9eaf740ef7405d2f32cd
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.24
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.24
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND==dev-libs/libgit2-0.21*:= >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ssh? ( dev-libs/libgit2[ssh] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) ) !<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 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Git library for GLib
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python ssh +vala python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2+
-RDEPEND==dev-libs/libgit2-0.21*:= >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ssh? ( dev-libs/libgit2[ssh] )
-REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.0/libgit2-glib-0.0.24.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fce7cbb318c35f4ca07ebac963a010ab
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.22.0
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.22.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libgit2-0.21.0:= <dev-libs/libgit2-0.23 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ssh? ( dev-libs/libgit2[ssh] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) ) !<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 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Git library for GLib
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python ssh +vala python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libgit2-0.21.0:= <dev-libs/libgit2-0.23 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ssh? ( dev-libs/libgit2[ssh] )
-REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.22/libgit2-glib-0.22.0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2a8ad27930f340467ed2a341bbf7cf2e
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.23.6
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.23.6
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/libgit2-0.23.0:= >=dev-libs/glib-2.44.0:2 >=dev-libs/gobject-introspection-0.10.1:= python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssh? ( dev-libs/libgit2[ssh] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Git library for GLib
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
+IUSE=python ssh +vala python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/libgit2-0.23.0:= >=dev-libs/glib-2.44.0:2 >=dev-libs/gobject-introspection-0.10.1:= python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssh? ( dev-libs/libgit2[ssh] )
+REQUIRED_USE=python? ( || ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgit2-glib/0.23/libgit2-glib-0.23.6.tar.xz
+_eclasses_=eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4a4e19791c6ce82199b5c5c8965786a3
--- a/metadata/md5-cache/dev-python/libvirt-python-1.2.21
+++ b/metadata/md5-cache/dev-python/libvirt-python-1.2.21
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-emulation/libvirt:0/1.2.21 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=libvirt Python bindings
+EAPI=5
+HOMEPAGE=http://www.libvirt.org
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/libvirt:0/1.2.21 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://libvirt.org/sources/python/libvirt-python-1.2.21.tar.gz
+_eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	8644194de7be04932084752fb1327080	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=42bb13a23da097efe3ec195427c005f5
--- a/metadata/md5-cache/dev-ruby/maxitest-1.5.4
+++ b/metadata/md5-cache/dev-ruby/maxitest-1.5.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/bundler[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] ) ) 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_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Minitest + all the features you always wanted
+EAPI=5
+HOMEPAGE=https://github.com/grosser/maxitest
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( <dev-ruby/minitest-5.9.0:5[ruby_targets_ruby22] ) 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_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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=1
+SRC_URI=https://github.com/grosser/maxitest/archive/v1.5.4.tar.gz -> maxitest-1.5.4.tar.gz
+_eclasses_=eutils	8644194de7be04932084752fb1327080	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=48df99ce0b482843bdac064cfeabd59c
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.5.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.5.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/maxitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] ) ) 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_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_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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=A drop-in component to enable HTTP caching for Rack-based applications that produce freshness info
+EAPI=5
+HOMEPAGE=https://github.com/rtomayko/rack-cache
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-ruby/rack:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rack:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) 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_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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=1.2
+SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.5.1.tar.gz -> rack-cache-1.5.1.tar.gz
+_eclasses_=eutils	8644194de7be04932084752fb1327080	java-utils-2	a96633177f44ee992b3fce360d1c4f16	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	ruby-fakegem	492d8bd1686b3d4215b3e207e0c73884	ruby-ng	79b6c8cabcf1e455baae2f2168e8e370	ruby-utils	97c910cb6b087c64260df641a9b3de0c	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ce2fa1a547e6e22b64f81056a390794b
--- a/metadata/md5-cache/dev-vcs/gitg-0.2.7
+++ b/metadata/md5-cache/dev-vcs/gitg-0.2.7
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0.0:3 >=x11-libs/gtksourceview-3.1.3:3.0 >=gnome-base/gconf-2.10:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 dev-vcs/git glade? ( >=dev-util/glade-3.2:3.10 ) gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=git repository viewer for GNOME
-EAPI=5
-HOMEPAGE=https://git.gnome.org/browse/gitg/
-IUSE=debug glade
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0.0:3 >=x11-libs/gtksourceview-3.1.3:3.0 >=gnome-base/gconf-2.10:2 >=gnome-base/gsettings-desktop-schemas-0.1.1 dev-vcs/git glade? ( >=dev-util/glade-3.2:3.10 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/0.2/gitg-0.2.7.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=19ef243a6857fba6b68e64033edc976a
--- a/metadata/md5-cache/dev-vcs/gitg-0.3.2
+++ b/metadata/md5-cache/dev-vcs/gitg-0.3.2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.0.10 <dev-libs/libgit2-glib-0.0.16 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:3[introspection] >=x11-libs/gtk+-3.10.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) !<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 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=git repository viewer for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
-IUSE=debug glade +python debug python_targets_python3_3
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.0.10 <dev-libs/libgit2-glib-0.0.16 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:3[introspection] >=x11-libs/gtk+-3.10.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_3 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/0.3/gitg-0.3.2.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=388b061124f5ac1cc6ea6f0c23fa8e16
--- a/metadata/md5-cache/dev-vcs/gitg-3.14.0
+++ b/metadata/md5-cache/dev-vcs/gitg-3.14.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.0.20 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:3[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) dev-libs/libgit2-glib[vala] gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) !<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 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=git repository viewer for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
-IUSE=debug glade +python debug python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.0.20 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:3[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
-REQUIRED_USE=python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/3.14/gitg-3.14.0.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c145137b33b5e133681fb3b28d9d717
--- a/metadata/md5-cache/dev-vcs/gitg-3.14.1
+++ b/metadata/md5-cache/dev-vcs/gitg-3.14.1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.22.0 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:4[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-libs/libgit2-glib-0.22.0[vala] gnome-base/gnome-common >=sys-devel/gettext-0.17 virtual/pkgconfig >=dev-util/intltool-0.40 || ( dev-lang/vala:0.30 dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) !<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 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=git repository viewer for GNOME
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Gitg
-IUSE=debug glade +python debug python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=dev-libs/libgee:0.8[introspection] >=dev-libs/json-glib-0.16 >=app-text/gtkspell-3.0.3:3 >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.10.1 dev-libs/libgit2[threads] >=dev-libs/libgit2-glib-0.22.0 >=dev-libs/libpeas-1.5.0[gtk] >=gnome-base/gsettings-desktop-schemas-0.1.1 >=net-libs/webkit-gtk-2.2:4[introspection] >=x11-libs/gtk+-3.12.0:3 >=x11-libs/gtksourceview-3.10:3.0 >=x11-themes/gnome-icon-theme-symbolic-3.10 glade? ( >=dev-util/glade-3.2:3.10 ) python? ( python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/libpeas[python,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
-REQUIRED_USE=python? ( ^^ ( python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gitg/3.14/gitg-3.14.1.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	fb656e31d5596be6ac85cde42dccfcb6	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=88ea5d5b5ef532fd7f8b5366e15721bc
--- a/metadata/md5-cache/gnome-base/gvfs-1.26.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.26.2
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 >=dev-libs/libgdata-0.17.3:= net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-core-12.3.0 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) !<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 app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 >=dev-libs/libgdata-0.17.3:=[gnome] net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-core-12.3.0 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) !<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 app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Virtual filesystem implementation for gio
 EAPI=5
 HOMEPAGE=https://git.gnome.org/browse/gvfs
 IUSE=afp archive bluray cdda fuse gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
-RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 >=dev-libs/libgdata-0.17.3:= net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
+RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.45.7:2 sys-apps/dbus dev-libs/libxml2:2 >=dev-libs/libgdata-0.17.3:=[gnome] net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.1.5:= >=app-pda/libplist-1:= ) mtp? ( >=media-libs/libmtp-1.1.6 ) nfs? ( >=net-fs/libnfs-1.9.7 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) systemd? ( sys-apps/systemd:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) virtual/libgudev:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
 REQUIRED_USE=cdda? ( udev ) mtp? ( udev ) udisks? ( udev ) systemd? ( udisks )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.26/gvfs-1.26.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b96f5289dc1139a847b9421eaf464e34
+_md5_=994ded6023c7d6ccca8bf63327c14e96
--- a/metadata/md5-cache/gnome-extra/gnome-builder-3.18.1
+++ b/metadata/md5-cache/gnome-extra/gnome-builder-3.18.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/gjs-1.42 >=dev-libs/glib-2.45.8:2[dbus] dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.23.4[ssh] >=dev-libs/libpeas-1.14.1 >=dev-libs/libxml2-2.9 dev-util/uncrustify sys-devel/clang >=x11-libs/gtk+-3.17.8:3[introspection?] >=x11-libs/gtksourceview-3.17.7:3.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3 ) vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.50.1 >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Builder attempts to be an IDE for writing software for GNOME
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder
+IUSE=+introspection python vala python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/gjs-1.42 >=dev-libs/glib-2.45.8:2[dbus] dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.23.4[ssh] >=dev-libs/libpeas-1.14.1 >=dev-libs/libxml2-2.9 dev-util/uncrustify sys-devel/clang >=x11-libs/gtk+-3.17.8:3[introspection?] >=x11-libs/gtksourceview-3.17.7:3.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42:= ) python? ( python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3 ) vala? ( || ( dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/3.18/gnome-builder-3.18.1.tar.xz
+_eclasses_=eutils	8644194de7be04932084752fb1327080	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-single-r1	f0877a50e1277a64cd4fe5855250102b	python-utils-r1	7d52f592fc09a002ea150d69507b5bad	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vala	15f7a43101d2ff0c6dcdab272c02f469	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
+_md5_=f378116eb04f7907e6ab2194a4af9528
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST maxitest-1.5.4.tar.gz 13723 SHA256 d03018f2a0d0414b7ce9df7a1326e6b0d615323b109084f3191472027d60a24c SHA512 b2b7c0ac561f7f62f94a86d1f84b1aa4e9dfe65840607ebc1178055e82a759aed74637a721c7eeb234e5efdf52ef6386e36097dcb165bbd001758a96e588d8e6 WHIRLPOOL c3fbc53e5e23da0e85fcdab9578af13b278dca9bea6738ca9ebe6eeecb8e72783e5c147d4e79dbe03185e365856dbdcbadf8a936916393946fd0f9ae5b3bf097`