Sync with portage [Fri Jul 15 12:27:31 MSK 2016].

8 years ago · 2d59557ddd
parent e64f4d8a47
commit 2d59557ddd
135 changed files with 1711 additions and 2890 deletions
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@ -1,8 +1,4 @@
 DIST puppet-agent_1.4.2-1wheezy_amd64.deb 21510444 SHA256 ee08eab9e50f9afdc979b2faa5633a3ea4d0ed7cc6fb3e9abc229098e06b9206 SHA512 fa9c47cab3847fde435c8e8a6ef875d392f86c1083e884ec4645e94d4a8620224cd5e43e3b5b8f343278b5fe6c73c41cec452a6872afc3f11a4ab0589e2b9292 WHIRLPOOL 4e082ac505baee8c4fb560ba72c12998cf72e0d13d6e13cce498239412fd638db7f36a680fbe54ddd0a9aafa4b494eba38fe11b9f29f7d28aed5171b370fbaef
 DIST puppet-agent_1.4.2-1wheezy_i386.deb 21254628 SHA256 4683fb7970805a815fe0b500de67e5d1e2b6fa88b19de36cd5326120a2eafdcb SHA512 bac02e08d8d753d6785e6a08c51009ff3ae02e547e942a21177bce6bf97b381a5110d1989fcdae6f3074b9dd9209bd5ff3d01a211f96efb25d24dcf271aa7a26 WHIRLPOOL 742bbcb6f6c55246f7e0f97978919a8d9f3b5f1acfd02e65b13973ffd3a3ebab62a385b0fdfb9076b27dfe2f7b68f25a37724eeec993a6f4c48ec7d145042892
-DIST puppet-agent_1.5.0-1xenial_amd64.deb 12958702 SHA256 288bc9cdf318d5a373889e9906f49d96e99c91f996b806e9926469e6adb9afad SHA512 1c6e89b055c8d3937137b91d5f823274f39dcafe9bb65740b17a9d51a37f62d2c6f1a1d52b5f9a8bcdc72880eda158bc7cfe97255b4a4c2a048e71229fb6bb83 WHIRLPOOL c1175cc516f1c9ecc28f97163f9117813415f8011148ece59350b246c39e1b327b8e0a9927914ce8af963020e5a52b3d9839be5c3a0b6a82f242009d9f5999e3
-DIST puppet-agent_1.5.0-1xenial_i386.deb 14003222 SHA256 88c4560b1e49f000e0b36ac8a567faa8b1c49c244722cb4bb63e78a6109a21b2 SHA512 b4fd141c481411b08e4b8e65eb28dbd749e5a84bf20070b2fb818fcf34e18828d6c7edc222784f0ae363b07bb634ee12f7114a31b720ef601962dc354b6cd94f WHIRLPOOL ba116eafe5304f8896c510ffd1e42a90e34851ca367e8c82d3570ac7186d63ebca07151e565f8ebfdd33aad16e82698a37aed6f3ce0b679ca4f25e864243d010
-DIST puppet-agent_1.5.1-1xenial_amd64.deb 12981352 SHA256 71bd54296485aeee7bb2e6851904907cee3f31114efa497bf9e999c3a3f15148 SHA512 eabe78c021d70cfea37343daa92b0cb1b1a342c6b8a59e16f83b81d2db8b36e251c44aae7ccd1d6284371e1e50e96ce3d410f1b4481d3f4202ea5904a594a917 WHIRLPOOL dbedf532027091f239bca4eac0fbcb8fb137f76dadc6c0172ceca67a55ef74948a009c978893713277931969d42ef42d6e4bb724490c0b7e67e9eabb0b9f783c
-DIST puppet-agent_1.5.1-1xenial_i386.deb 14023324 SHA256 94509aaa5f03be6e1a73d99585520638f50a582c71d8cfa8432c4f2509907ce4 SHA512 f6c489eec7336388a4ba3ea1c3bcb36e35958b1b1062e9dd4419a68337fbdc2490d775d692830c97fba35a70fbb4c2cb69173643d13a931d011c5b5faf06eff2 WHIRLPOOL 26e4f587af78f3a3bcbb5898416d2aafdb4f1fccf73eb8cab2edf955c8f7a574ea293fc2af97dac9baa7ac8c68593ea9d8981cdff7fda4240647585a4de8061c
 DIST puppet-agent_1.5.2-1xenial_amd64.deb 12979184 SHA256 917c4dfccf6ac08ab62965262738927d8e50345fe1c9e58e91a8c8b8a0a82b3c SHA512 d662ca7a3c4c3ed0ce83c8b3de5aa862504ec44c7d3b18211aa46cca441b73e5b9929584b436ae2bf8d25b04badbb14af45a1f83a27fd9593cc961345235169e WHIRLPOOL 293a8818df6fade05a3a439f4e77b5d884aa6a9f6a0f0798883455c95332782467df640915d48c29fdd63b18708415376cece4f0633cbc22d333a06782260164
 DIST puppet-agent_1.5.2-1xenial_i386.deb 14019620 SHA256 b5220616f12408a422ca65f0bab8bfeeb7dab026448c3141d3afe54f4e455899 SHA512 59611a7d4faa75b16dd492f14da3bacb5b50722b773bdd882d7be08e576462412f5aacb7f247492869048e7d1290824652b37b3ba088ca27da08306bb3137f54 WHIRLPOOL b5757c879ca6a2ecb9e9656ca899eabbeb34af3ce93bc078ed9ac41a601a65f1a2a5b4e738b282c7d1e469e2c63df67072a7ea63c7826340da3227ab24816cf7
--- a/app-admin/puppet-agent/puppet-agent-1.5.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.5.0.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
--- a/app-admin/puppet-agent/puppet-agent-1.5.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.5.1.ebuild
@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
--- a/app-admin/puppet-agent/puppet-agent-1.5.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.5.2.ebuild
@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"

--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@ -1,5 +1,6 @@
 DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd WHIRLPOOL 71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
 DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd WHIRLPOOL ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
 DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5 WHIRLPOOL 52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
+DIST p7zip_16.02_src_all.tar.bz2 4239909 SHA256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f WHIRLPOOL b22f4dce96505094ffdee0963fa7e5fd75e92f2c920f2e69e18eff60a2ad9d4757c3512c8d4e7c4848a36212f54637a963ff41fc5c00bb7381f43220662108b9
 DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
 DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
--- a/app-arch/p7zip/files/p7zip-16.02-darwin.patch
+++ b/app-arch/p7zip/files/p7zip-16.02-darwin.patch
@ -0,0 +1,11 @@
+--- p7zip_15.14.1/CPP/myWindows/StdAfx.h
+++ p7zip_15.14.1/CPP/myWindows/StdAfx.h
+@@ -32,7 +32,7 @@
+ #include <errno.h>
+ #include <math.h>
+ 
+-#ifdef __NETWARE__
+#if defined(__NETWARE__) || defined(__MACH__)
+ #include <sys/types.h>
+ #endif
+ 
--- a/app-arch/p7zip/p7zip-16.02.ebuild
+++ b/app-arch/p7zip/p7zip-16.02.ebuild
@ -0,0 +1,159 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="Port of 7-Zip archiver for Unix"
+HOMEPAGE="http://p7zip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
+
+LICENSE="LGPL-2.1 rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
+
+REQUIRED_USE="kde? ( wxwidgets )"
+
+RDEPEND="
+	kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/yasm )
+	abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin.patch
+
+	if ! use pch; then
+		sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
+	fi
+
+	sed \
+		-e 's:-m32 ::g' \
+		-e 's:-m64 ::g' \
+		-e 's:-pipe::g' \
+		-e '/ALLFLAGS/s:-s ::' \
+		-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
+		-i makefile* || die
+
+	# remove non-free RAR codec
+	if use rar; then
+		ewarn "Enabling nonfree RAR decompressor"
+	else
+		sed \
+			-e '/Rar/d' \
+			-e '/RAR/d' \
+			-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
+		rm -rf CPP/7zip/Compress/Rar || die
+	fi
+
+	if use abi_x86_x32; then
+		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use amd64; then
+		cp -f makefile.linux_amd64_asm makefile.machine || die
+	elif use x86; then
+		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+	elif [[ ${CHOST} == *-darwin* ]] ; then
+		# Mac OS X needs this special makefile, because it has a non-GNU
+		# linker, it doesn't matter so much for bitwidth, for it doesn't
+		# do anything with it
+		cp -f makefile.macosx_llvm_64bits makefile.machine
+		# bundles have extension .bundle but don't die because USE=-rar
+		# removes the Rar directory
+		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
+			CPP/Windows/DLL.cpp || die
+		sed -i -e '/^PROG=/s/\.so/.bundle/' \
+			CPP/7zip/Bundles/Format7zFree/makefile.list \
+			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
+	elif use x86-fbsd; then
+		# FreeBSD needs this special makefile, because it hasn't -ldl
+		sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
+	fi
+
+	if use static; then
+		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
+	fi
+
+	if use kde || use wxwidgets; then
+		need-wxwidgets unicode
+		einfo "Preparing dependency list"
+		emake depend
+	fi
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
+	if use kde || use wxwidgets; then
+		emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
+#		emake -- 7zFM
+	fi
+}
+
+src_test() {
+	emake test test_7z test_7zr
+}
+
+src_install() {
+	# this wrappers can not be symlinks, p7zip should be called with full path
+	make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
+	make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
+	make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
+
+	if use kde || use wxwidgets; then
+		make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
+#		make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
+
+#		make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
+
+		dobin GUI/p7zipForFilemanager
+		exeinto /usr/$(get_libdir)/${PN}
+#		doexe bin/7z{G,FM}
+		doexe bin/7zG
+
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r GUI/Lang
+		doins -r DOC/MANUAL
+
+		insinto /usr/share/icons/hicolor/16x16/apps/
+		newins GUI/p7zip_16_ok.png p7zip.png
+
+		if use kde; then
+			rm GUI/kde4/p7zip_compress.desktop || die
+			insinto /usr/share/kde4/services/ServiceMenus
+			doins GUI/kde4/*.desktop
+			dodir /usr/share/kservices5/ServiceMenus
+			for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
+				item="$(basename ${item})"
+				dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}"
+			done
+		fi
+	fi
+
+	dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
+	doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
+	doexe bin/*$(get_modname)
+	if use rar; then
+		exeinto /usr/$(get_libdir)/${PN}/Codecs/
+		doexe bin/Codecs/*$(get_modname)
+	fi
+
+	doman man1/7z.1 man1/7za.1 man1/7zr.1
+	dodoc ChangeLog README TODO
+
+	if use doc; then
+		dodoc DOC/*.txt
+		dohtml -r DOC/MANUAL/*
+	fi
+}
--- a/app-emulation/docker/docker-1.12.0_rc4-r1.ebuild
+++ b/app-emulation/docker/docker-1.12.0_rc4-r1.ebuild
@ -0,0 +1,270 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGO_PN="github.com/docker/docker"
+
+if [[ ${PV} = *9999* ]]; then
+	# Docker cannot be fetched via "go get", thanks to autogenerated code
+	EGIT_REPO_URI="https://${EGO_PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	DOCKER_GITCOMMIT="e4a0dbc"
+	EGIT_COMMIT="v${MY_PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+	inherit golang-vcs-snapshot
+fi
+inherit bash-completion-r1 golang-base linux-info systemd udev user
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://dockerproject.org"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor aufs btrfs +device-mapper experimental overlay seccomp"
+
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#build-dependencies
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		>=sys-fs/lvm2-2.02.89[thin]
+	)
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+	apparmor? ( sys-libs/libapparmor )
+"
+
+DEPEND="
+	${CDEPEND}
+
+	dev-go/go-md2man
+
+	btrfs? (
+		>=sys-fs/btrfs-progs-3.8
+	)
+"
+
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#runtime-dependencies
+# https://github.com/docker/docker/blob/master/hack/PACKAGERS.md#optional-dependencies
+RDEPEND="
+	${CDEPEND}
+
+	!app-emulation/docker-bin
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+
+	>app-emulation/containerd-0.2.2
+	app-emulation/runc[apparmor?,seccomp?]
+"
+
+RESTRICT="installsources strip"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~DEVPTS_MULTIPLE_INSTANCES
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+	~IP_VS
+	~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
+	~NF_NAT ~NF_NAT_NEEDED
+
+	~POSIX_MQUEUE
+
+	~MEMCG_KMEM ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
+
+	~BLK_CGROUP ~IOSCHED_CFQ
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+	~XFRM_ALGO ~XFRM_USER
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+	if kernel_is lt 3 10; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
+		ewarn " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
+	fi
+
+	# for where these kernel versions come from, see:
+	# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
+	if ! {
+		kernel_is ge 3 16 \
+		|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
+		|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
+		|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
+	}; then
+		ewarn ""
+		ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
+		ewarn "  (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
+		ewarn ""
+		ewarn "See also https://github.com/docker/docker/issues/2960"
+	fi
+
+	if kernel_is le 3 18; then
+		CONFIG_CHECK+="
+			~RESOURCE_COUNTERS
+		"
+	fi
+
+	if kernel_is le 3 13; then
+		CONFIG_CHECK+="
+			~NETPRIO_CGROUP
+		"
+	else
+		CONFIG_CHECK+="
+			~CGROUP_NET_PRIO
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	if use overlay; then
+		CONFIG_CHECK+="
+			~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	# create docker group for the code checking for it in /etc/group
+	enewgroup docker
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}/${P}:${PWD}/vendor"
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
+
+	# if we're building from a zip, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	if gcc-specs-pie; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
+	fi
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	# https://github.com/docker/docker/pull/13338
+	if use experimental; then
+		export DOCKER_EXPERIMENTAL=1
+	else
+		unset DOCKER_EXPERIMENTAL
+	fi
+
+	# time to build!
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+
+	# build the man pages too
+	./man/md2man-all.sh || die "unable to generate man pages"
+}
+
+src_install() {
+	VERSION="$(cat VERSION)"
+	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
+	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
+	newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+	doman man/man*/*
+
+	dobashcomp contrib/completion/bash/*
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/syntax/vim/ftdetect
+	doins -r contrib/syntax/vim/syntax
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	mkdir -p "${D}/usr/share/${PN}/contrib"
+	cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot, add Docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog "  usermod -aG docker youruser"
+	elog
+}
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@ -224,6 +224,7 @@ src_install() {
 	VERSION="$(cat VERSION)"
 	newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
 	newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
+	newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
 	dosym containerd /usr/bin/docker-containerd
 	dosym containerd-shim /usr/bin/docker-containerd-shim
 	dosym runc /usr/bin/docker-runc
--- a/app-i18n/xsim/Manifest
+++ b/app-i18n/xsim/Manifest
@ -1 +0,0 @@
-DIST xsim-0.3.9.4.tar.gz 1025640 SHA256 048f23527543b21c4d52dc98967ec7253c34eb704056767364c6dc5007971b2c SHA512 07955cf68cc060724db5fdf04f2f55a93dfe29064b63170bb3c090443aa617de5d76ddd5cda971b16833fd2e090aa78a3bbc0c85e9eb2b4716dfa90c994fc8d3 WHIRLPOOL 9de70a58279849d8e370d96f97459d866ca213feeeed16f00ddcd48d003f994999da26e635c718ffd9da8291c8c97bfe043df851ef809ee6e888492f7bcda8e7
--- a/app-i18n/xsim/files/xsim-0.3.9.4-64bit.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-64bit.patch
@ -1,57 +0,0 @@
-diff -Naur xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleimc.h xsim-0.3.9.4/plugins/IMs/jianpin/simpleimc.h
--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleimc.h	2002-10-22 18:01:04.000000000 +0900
-+++ xsim-0.3.9.4/plugins/IMs/jianpin/simpleimc.h	2007-08-20 23:15:06.000000000 +0900
-@@ -45,7 +45,7 @@
- 	uint16_t access_count;
- 	wchar_t w[MAX_WORD_LEN + 1];
- 
-	size_t ac_size() { return (uint32_t) w - (uint32_t)&access_count; }
-+	size_t ac_size() { return (size_t) w - (size_t)&access_count; }
- 	size_t size(){ return ac_size() + wcslen(w) * sizeof(wchar_t); }
- 	void copy(struct Word_Rec_tag * val) { memcpy(this, val, sizeof(Word_Rec_tag));}
- }Word_Rec;
-diff -Naur xsim-0.3.9.4.orig/plugins/IMs/table/tableimc.h xsim-0.3.9.4/plugins/IMs/table/tableimc.h
--- xsim-0.3.9.4.orig/plugins/IMs/table/tableimc.h	2002-09-13 20:34:03.000000000 +0900
-+++ xsim-0.3.9.4/plugins/IMs/table/tableimc.h	2007-08-20 23:15:47.000000000 +0900
-@@ -23,7 +23,7 @@
- 	uint8_t sort_index;
- 	wchar_t w[MAX_WORD_LEN + 1];
- 
-	size_t si_size() { return (uint32_t) w - (uint32_t)&sort_index; }
-+	size_t si_size() { return (size_t) w - (size_t)&sort_index; }
- 	size_t size(){ return si_size() + (wcslen(w) + 1) * sizeof(wchar_t); }
- 	void copy(struct Word_Rec_tag * val) { memcpy(this, val, sizeof(Word_Rec_tag));}
- }Word_Rec;
-diff -Naur xsim-0.3.9.4.orig/xsim/ic.cpp xsim-0.3.9.4/xsim/ic.cpp
--- xsim-0.3.9.4.orig/xsim/ic.cpp	2002-10-01 14:41:23.000000000 +0900
-+++ xsim-0.3.9.4/xsim/ic.cpp	2007-08-20 23:16:11.000000000 +0900
-@@ -101,7 +101,7 @@
- 	on_stat = 0;
- }
- 
-int TIC::alive()
-+long TIC::alive()
- {
-	return (int)im;
-+	return (long)im;
- }
-diff -Naur xsim-0.3.9.4.orig/xsim/ic.h xsim-0.3.9.4/xsim/ic.h
--- xsim-0.3.9.4.orig/xsim/ic.h	2002-07-15 00:14:24.000000000 +0900
-+++ xsim-0.3.9.4/xsim/ic.h	2007-08-20 23:16:52.000000000 +0900
-@@ -76,14 +76,14 @@
- 	void set_im(TIM * val);
- 
- 	TIMC * get_imc();
-	int has_imc() { return (int)imc; }
-+	long has_imc() { return (long)imc; }
- 
- 	void init(int init_mode, TIM * val);
- 
- 	static TIC * get_focus_ic() { return focused_ic; }
- 	IC * get_IC() { return &ic_; };
- 	
-	int alive();
-+	long alive();
- 	Window get_client_win() { return ic_.client_win; }
- 
- 	int has_focus() { return (focused_ic == this); }
--- a/app-i18n/xsim/files/xsim-0.3.9.4-compile-fix.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-compile-fix.patch
@ -1,77 +0,0 @@
-diff -uNr xsim-0.3.9.4.orig/configure xsim-0.3.9.4/configure
--- xsim-0.3.9.4.orig/configure	2002-10-24 20:53:57.000000000 +0200
-+++ xsim-0.3.9.4/configure	2005-01-27 16:21:18.553956144 +0100
-@@ -5067,13 +5067,13 @@
- 
- 
- if test "x$enable_debug" = "x1" ; then
-  CFLAGS="-g -Wall -O2 -DDEBUG -I$x_includes"
-+  CFLAGS="-g -Wall -O2 -DDEBUG"
-   CXXFLAGS=$CFLAGS
-  LDFLAGS="-g -L$x_libraries"
-+  LDFLAGS="-g"
- else
-  CFLAGS="-Wall -O2 -I$x_includes"
-+  CFLAGS="-Wall -O2"
-   CXXFLAGS=$CFLAGS
-  LDFLAGS="-L$x_libraries"
-+  LDFLAGS=""
- fi
- 
- if test "x$enable_mdk_patch" = "x1" ; then
-@@ -5085,6 +5085,7 @@
- 
- if test "$bdbinc" = "NONE"; then
-   bdb_include_dirs="\
-+    /usr/include/db4.1 \
-     /usr/include/db4 \
-     /usr/include/db3 \
-     /usr/local/include \
-diff -uNr xsim-0.3.9.4.orig/plugins/IMs/jianpin/pyphraser.cpp xsim-0.3.9.4/plugins/IMs/jianpin/pyphraser.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/pyphraser.cpp	2002-09-29 05:03:29.000000000 +0200
-+++ xsim-0.3.9.4/plugins/IMs/jianpin/pyphraser.cpp	2005-01-27 15:42:06.553514560 +0100
-@@ -16,6 +16,8 @@
- 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#include <cassert>
-+
- #include "wstring.h"
- #include "pyphraser.h"
- #include "simpleimc.h"
-diff -uNr xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleim.cpp xsim-0.3.9.4/plugins/IMs/jianpin/simpleim.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/simpleim.cpp	2002-10-22 11:42:51.000000000 +0200
-+++ xsim-0.3.9.4/plugins/IMs/jianpin/simpleim.cpp	2005-01-27 15:38:13.771902744 +0100
-@@ -15,6 +15,8 @@
- 	License along with this library; if not, write to the Free Software
- 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-+#include <cassert>
-+
- #include <X11/keysym.h>
- 
- #include "simpleim.h"
-diff -uNr xsim-0.3.9.4.orig/plugins/IMs/wubi/wubiim.cpp xsim-0.3.9.4/plugins/IMs/wubi/wubiim.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/wubi/wubiim.cpp	2002-10-22 11:22:13.000000000 +0200
-+++ xsim-0.3.9.4/plugins/IMs/wubi/wubiim.cpp	2005-01-27 16:06:29.427123968 +0100
-@@ -16,6 +16,8 @@
- 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#include <cassert>
-+
- #include <X11/keysym.h>
- 
- #include "wubiim.h"
-diff -uNr xsim-0.3.9.4.orig/xsim/im.cpp xsim-0.3.9.4/xsim/im.cpp
--- xsim-0.3.9.4.orig/xsim/im.cpp	2002-09-17 09:55:26.000000000 +0200
-+++ xsim-0.3.9.4/xsim/im.cpp	2005-01-27 16:07:52.252532592 +0100
-@@ -16,6 +16,8 @@
- 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#include <cassert>
-+
- #include <dlfcn.h>
- 
- #include "im.h"
--- a/app-i18n/xsim/files/xsim-0.3.9.4-eof.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-eof.patch
@ -1,92 +0,0 @@
-diff --git a/plugins/IMs/jianpin/dict/char2db.cpp b/plugins/IMs/jianpin/dict/char2db.cpp
-index f36dda9..fb17c6e 100644
--- a/plugins/IMs/jianpin/dict/char2db.cpp
-+++ b/plugins/IMs/jianpin/dict/char2db.cpp
-@@ -166,6 +166,8 @@ int main(int argc, char * argv[])
- 	int i = 0;
- 	for (;;){
- 		in >> mark;
-+		if (in.eof())
-+			break;
- 		in.unget();
- 		if (mark == '%'){			//for comments
- 			in.getline(dummy, 255);
-@@ -175,9 +177,6 @@ int main(int argc, char * argv[])
- 			}
- 		in >> ckey.py >> c;
- 
-		if (in.eof())
-			break;
-
- 		if (strlen(c) != 2){
- 			cout << "error on line: " << i << endl;
- 			exit(1);
-diff --git a/plugins/IMs/jianpin/dict/word2db.cpp b/plugins/IMs/jianpin/dict/word2db.cpp
-index 6b6b8e0..f9a6d0b 100644
--- a/plugins/IMs/jianpin/dict/word2db.cpp
-+++ b/plugins/IMs/jianpin/dict/word2db.cpp
-@@ -103,6 +103,8 @@ int main(int argc, char * argv[])
- 	rec.access_count = MAX_ACCESS_COUNT;
- 	for (;;){
- 		in >> mark;
-+		if (in.eof())
-+			break;
- 		in.unget();
- 		if (mark == '%'){			//for comments
- 			in.getline(wk.py, sizeof(wk.py));
-@@ -113,9 +115,6 @@ int main(int argc, char * argv[])
- 
- 		in >> w >> wk.py;
- 
-		if (in.eof())
-			break;
-
- 		if ((wk.py[0] < 'a') || (wk.py[0] > 'z')){
- 			cerr << " error on line:" << i << endl;
- 			db.close(0);
-diff --git a/plugins/IMs/table/dict/word2db.cpp b/plugins/IMs/table/dict/word2db.cpp
-index aa19a60..f0368ce 100644
--- a/plugins/IMs/table/dict/word2db.cpp
-+++ b/plugins/IMs/table/dict/word2db.cpp
-@@ -112,6 +112,8 @@ int main(int argc, char * argv[])
- 	for (;;){
- 		j++;
- 		in >> mark;
-+		if (in.eof())
-+			break;
- 		in.unget();
- 		if ((mark == '%') || (mark == '#')){			//for comments
- 			in.getline((char *)wbuf, 1000);
-@@ -123,9 +125,6 @@ int main(int argc, char * argv[])
- 
- 		in >> wk.key >> w;
- 
-		if (in.eof())
-			break;
-
- 		if ((wk.key[0] < 'a') || (wk.key[0] > 'z')){
- 			//cerr << " error on line:" << j << endl;
- 			errcnt ++;
-diff --git a/plugins/IMs/wubi/dict/word2db.cpp b/plugins/IMs/wubi/dict/word2db.cpp
-index a1df52b..3fe1e3e 100644
--- a/plugins/IMs/wubi/dict/word2db.cpp
-+++ b/plugins/IMs/wubi/dict/word2db.cpp
-@@ -103,6 +103,8 @@ int main(int argc, char * argv[])
- 	for (;;){
- 		j++;
- 		in >> mark;
-+		if (in.eof())
-+			break;
- 		in.unget();
- 		if (mark == '%'){			//for comments
- 			in.getline(wk.key, sizeof(wk.key));
-@@ -114,9 +116,6 @@ int main(int argc, char * argv[])
- 
- 		in >> wk.key >> w;
- 
-		if (in.eof())
-			break;
-
- 		if ((wk.key[0] < 'a') || (wk.key[0] > 'z')){
- 			//cerr << " error on line:" << j << endl;
- 			errcnt ++;
--- a/app-i18n/xsim/files/xsim-0.3.9.4-gcc-3.4.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-gcc-3.4.patch
@ -1,116 +0,0 @@
-diff --git a/plugins/IMs/jianpin/dict/char2db.cpp b/plugins/IMs/jianpin/dict/char2db.cpp
-index d881f20..e4ddbab 100644
--- a/plugins/IMs/jianpin/dict/char2db.cpp
-+++ b/plugins/IMs/jianpin/dict/char2db.cpp
-@@ -74,11 +74,7 @@ void build_freq_tab(char * filename)
- {
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	f.open(filename, ios_base::in);
-#else
-	f.open(filename, "r");
-#endif
- 	istream in(&f);
- 
- 	char cbuf[10];
-@@ -154,11 +150,7 @@ int main(int argc, char * argv[])
- 
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	f.open(argv[1], ios_base::in);
-#else
-	f.open(argv[1], "r");
-#endif
- 	istream in(&f);
- 
- 	char mark;
-diff --git a/plugins/IMs/jianpin/dict/word2db.cpp b/plugins/IMs/jianpin/dict/word2db.cpp
-index 806f6c4..5baa630 100644
--- a/plugins/IMs/jianpin/dict/word2db.cpp
-+++ b/plugins/IMs/jianpin/dict/word2db.cpp
-@@ -83,11 +83,7 @@ int main(int argc, char * argv[])
- 
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	f.open(argv[1], ios_base::in);
-#else
-	f.open(argv[1], "r");
-#endif
- 	istream in(&f);
- 
- 	char mark;
-diff --git a/plugins/IMs/table/dict/word2db.cpp b/plugins/IMs/table/dict/word2db.cpp
-index 17d0dcf..275ee61 100644
--- a/plugins/IMs/table/dict/word2db.cpp
-+++ b/plugins/IMs/table/dict/word2db.cpp
-@@ -90,11 +90,7 @@ int main(int argc, char * argv[])
- 
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	f.open(argv[1], ios_base::in);
-#else
-	f.open(argv[1], "r");
-#endif
- 	istream in(&f);
- 
- 	char mark;
-diff --git a/plugins/IMs/wubi/dict/word2db.cpp b/plugins/IMs/wubi/dict/word2db.cpp
-index 0dbc7e4..e191aa8 100644
--- a/plugins/IMs/wubi/dict/word2db.cpp
-+++ b/plugins/IMs/wubi/dict/word2db.cpp
-@@ -81,11 +81,7 @@ int main(int argc, char * argv[])
- 
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	f.open(argv[1], ios_base::in);
-#else
-	f.open(argv[1], "r");
-#endif
- 	istream in(&f);
- 
- 	char mark;
-diff --git a/xsim/conf.cpp b/xsim/conf.cpp
-index a073bb2..a2bffb0 100644
--- a/xsim/conf.cpp
-+++ b/xsim/conf.cpp
-@@ -133,11 +133,7 @@ int TConf::init()
-         filebuf f;
- 
- 	char dummy[MAX_PATH_LEN + 1];
-#ifdef _CPP_BITS_IOSBASE_H
- 	if (!f.open(config_path.tombs(dummy, MAX_PATH_LEN), ios_base::in)){
-#else
-	if (!f.open(config_path.tombs(dummy, MAX_PATH_LEN), "r")){
-#endif
- 		cerr << "XSIM: failed opening config file" << endl;
- 		return 1;
- 		}
-@@ -340,11 +336,7 @@ void TConf::save_config(const wchar_t * configname, vector<TWstring> & name, vec
- 
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	if (f.open(path.tombs(dummy, MAX_PATH_LEN), ios_base::out)){
-#else
-	if (f.open(path.tombs(dummy, MAX_PATH_LEN), "w")){
-#endif
- 		ostream out(&f);
- 		for (size_t i = 0; i < name.size(); i++){
- 			out << name[i].tombs(dummy, MAX_PATH_LEN) << '\t';
-@@ -372,11 +364,7 @@ int TConf::load_config(const wchar_t * configname, vector<TWstring> & name, vect
- 
-         filebuf f;
- 
-#ifdef _CPP_BITS_IOSBASE_H
- 	if (f.open(path.tombs(dummy, MAX_PATH_LEN), ios_base::in)){
-#else
-	if (f.open(path.tombs(dummy, MAX_PATH_LEN), "r")){
-#endif
- 		istream in(&f);
- 		char n[MAX_PATH_LEN + 1];
- 		char v[MAX_PATH_LEN + 1];
--- a/app-i18n/xsim/files/xsim-0.3.9.4-gcc-4.3.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-gcc-4.3.patch
@ -1,44 +0,0 @@
-diff -Naur xsim-0.3.9.4.orig/plugins/IMs/jianpin/dict/char2db.cpp xsim-0.3.9.4/plugins/IMs/jianpin/dict/char2db.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/dict/char2db.cpp	2002-09-23 13:22:39.000000000 +0900
-+++ xsim-0.3.9.4/plugins/IMs/jianpin/dict/char2db.cpp	2008-09-09 18:56:56.000000000 +0900
-@@ -21,6 +21,7 @@
- #include <clocale>
- #include <vector>
- #include <fstream>
-+#include <cstdlib>
- 
- #include <db_cxx.h>
- 
-diff -Naur xsim-0.3.9.4.orig/plugins/IMs/jianpin/dict/word2db.cpp xsim-0.3.9.4/plugins/IMs/jianpin/dict/word2db.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/jianpin/dict/word2db.cpp	2002-09-23 13:24:17.000000000 +0900
-+++ xsim-0.3.9.4/plugins/IMs/jianpin/dict/word2db.cpp	2008-09-09 18:59:33.000000000 +0900
-@@ -21,6 +21,7 @@
- #include <string>
- #include <db_cxx.h>
- #include <locale.h>
-+#include <cstdlib>
- 
- #include "../simpleimc.h"
- 
-diff -Naur xsim-0.3.9.4.orig/plugins/IMs/table/dict/word2db.cpp xsim-0.3.9.4/plugins/IMs/table/dict/word2db.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/table/dict/word2db.cpp	2002-09-23 13:34:06.000000000 +0900
-+++ xsim-0.3.9.4/plugins/IMs/table/dict/word2db.cpp	2008-09-09 23:52:31.000000000 +0900
-@@ -21,6 +21,7 @@
- #include <string>
- #include <db_cxx.h>
- #include <clocale>
-+#include <cstdlib>
- 
- #include "../tableimc.h"
- 
-diff -Naur xsim-0.3.9.4.orig/plugins/IMs/wubi/dict/word2db.cpp xsim-0.3.9.4/plugins/IMs/wubi/dict/word2db.cpp
--- xsim-0.3.9.4.orig/plugins/IMs/wubi/dict/word2db.cpp	2002-09-23 13:28:45.000000000 +0900
-+++ xsim-0.3.9.4/plugins/IMs/wubi/dict/word2db.cpp	2008-09-09 23:19:27.000000000 +0900
-@@ -21,6 +21,7 @@
- #include <string>
- #include <db_cxx.h>
- #include <locale.h>
-+#include <cstdlib>
- 
- #include "../wubiimc.h"
- 
--- a/app-i18n/xsim/files/xsim-0.3.9.4-makefile.patch
+++ b/app-i18n/xsim/files/xsim-0.3.9.4-makefile.patch
@ -1,153 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6a7a195..6d2b4e6 100644
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -36,7 +36,7 @@ distclean: clean
- 	done && test -z "$$fail"
- 
- install-data:
-	cd plugins/IMs;make install-data
-+	cd plugins/IMs;$(MAKE) install-data
- 
- uninstall:
- 	@for dir in ${subdirs}; do \
-diff --git a/plugins/IMs/jianpin/Makefile.in b/plugins/IMs/jianpin/Makefile.in
-index cbbac33..50d7ef0 100644
--- a/plugins/IMs/jianpin/Makefile.in
-+++ b/plugins/IMs/jianpin/Makefile.in
-@@ -25,7 +25,7 @@ OBJS=simpleim.o simpleimc.o pyphraser.o
- TARGET=jianpin.so
- 
- all:$(TARGET)
-	cd dict; make
-+	cd dict; $(MAKE)
- 
- jianpin.so:$(OBJS)
- 	$(LD_SHAREEXE) -shared -o $(TARGET) $(OBJS) $(LDFLAGS) -L$(bdblibs) $(LIBS) -l$(bdblib) $(gcclib)
-@@ -41,20 +41,20 @@ pyphraser.o:pyphraser.cpp pyphraser.h simpleimc.h $(include_path)wstring.h
- 
- clean:
- 	rm -f *.o $(TARGET) core *~ *.bak
-	cd dict; make clean
-+	cd dict; $(MAKE) clean
- 
- distclean:clean
- 	rm -rf Makefile
-	cd dict; make distclean
-+	cd dict; $(MAKE) distclean
- 
- install:all
- 	$(topdir)/mkinstalldirs $(xsim_libp)
- 	cp -f $(TARGET) $(xsim_libp)
-	cd dict; make install
-+	cd dict; $(MAKE) install
- 
- install-data:
-	cd dict;make install-data
-+	cd dict;$(MAKE) install-data
- 
- uninstall:
- 	cd $(xsim_libp); rm -f $(TARGET)
-	cd dict;make uninstall
-+	cd dict;$(MAKE) uninstall
-diff --git a/plugins/IMs/table/Makefile.in b/plugins/IMs/table/Makefile.in
-index a747560..cbc67bc 100644
--- a/plugins/IMs/table/Makefile.in
-+++ b/plugins/IMs/table/Makefile.in
-@@ -25,7 +25,7 @@ OBJS=tableim.o tableimc.o
- TARGET=table.so
- 
- all:$(TARGET)
-	cd dict; make
-+	cd dict; $(MAKE)
- 
- $(TARGET):$(OBJS)
- 	$(LD_SHAREEXE) -shared -o $(TARGET) $(OBJS) $(LDFLAGS) -L$(bdblibs) $(LIBS) -l$(bdblib) $(gcclib)
-@@ -38,20 +38,20 @@ tableimc.o:tableimc.h tableimc.cpp $(include_path)wstring.h $(include_path)imc.h
- 
- clean:
- 	rm -f *.o $(TARGET) core *~ *.bak
-	cd dict; make clean
-+	cd dict; $(MAKE) clean
- 
- distclean:clean
- 	rm -rf Makefile
-	cd dict; make distclean
-+	cd dict; $(MAKE) distclean
- 
- install:all
- 	$(topdir)/mkinstalldirs $(xsim_libp)
- 	cp -f $(TARGET) $(xsim_libp)
-	cd dict; make install
-+	cd dict; $(MAKE) install
- 
- install-data:
-	cd dict;make install-data
-+	cd dict;$(MAKE) install-data
- 
- uninstall:
- 	cd $(xsim_libp); rm -f $(TARGET)
-	cd dict; make uninstall
-+	cd dict; $(MAKE) uninstall
-diff --git a/plugins/IMs/wubi/Makefile.in b/plugins/IMs/wubi/Makefile.in
-index 031f1a7..c3d0f88 100644
--- a/plugins/IMs/wubi/Makefile.in
-+++ b/plugins/IMs/wubi/Makefile.in
-@@ -25,7 +25,7 @@ OBJS=wubiim.o wubiimc.o
- TARGET=wubi.so
- 
- all:$(TARGET)
-	cd dict; make
-+	cd dict; $(MAKE)
- 
- $(TARGET):$(OBJS)
- 	$(LD_SHAREEXE) -shared -o $(TARGET) $(OBJS) $(LDFLAGS) -L$(bdblibs) $(LIBS) -l$(bdblib) $(gcclib)
-@@ -38,20 +38,20 @@ wubiimc.o:wubiimc.h wubiimc.cpp $(include_path)wstring.h $(include_path)imc.h
- 
- clean:
- 	rm -f *.o $(TARGET) core *~ *.bak
-	cd dict; make clean
-+	cd dict; $(MAKE) clean
- 
- distclean:clean
- 	rm -rf Makefile
-	cd dict; make distclean
-+	cd dict; $(MAKE) distclean
- 
- install:all
- 	$(topdir)/mkinstalldirs $(xsim_libp)
- 	cp -f $(TARGET) $(xsim_libp)
-	cd dict; make install
-+	cd dict; $(MAKE) install
- 
- install-data:
-	cd dict;make install-data
-+	cd dict;$(MAKE) install-data
- 
- uninstall:
- 	cd $(xsim_libp); rm -f $(TARGET)
-	cd dict; make uninstall
-+	cd dict; $(MAKE) uninstall
-diff --git a/xsim/Makefile.in b/xsim/Makefile.in
-index d618a2c..bbe1599 100644
--- a/xsim/Makefile.in
-+++ b/xsim/Makefile.in
-@@ -58,15 +58,15 @@ wstring.o:wstring.h wstring.cpp
- 	$(CXX) -c wstring.cpp $(CXXFLAGS) -I./IMdkit
- 
- IMdkit/libXimd.a:
-	cd IMdkit;make
-+	cd IMdkit;$(MAKE)
- 
- clean:
- 	rm -f *.o xsim core *~ *.bak
-	cd IMdkit; make clean
-+	cd IMdkit; $(MAKE) clean
- 
- distclean:clean
- 	rm -rf Makefile tags
-	cd IMdkit; make distclean
-+	cd IMdkit; $(MAKE) distclean
- 
- install:all
- 	$(topdir)/mkinstalldirs $(xsim_binp)
--- a/app-i18n/xsim/metadata.xml
+++ b/app-i18n/xsim/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-</pkgmetadata>
--- a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
+++ b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit db-use eutils flag-o-matic multilib
-
-DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
-HOMEPAGE="http://developer.berlios.de/projects/xsim/"
-#SRC_URI="mirror://berlios/xsim/${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND=">=sys-libs/db-4.1
-	x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	local dbver
-
-	epatch "${FILESDIR}"/${P}-compile-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc-3.4.patch
-	epatch "${FILESDIR}"/${P}-64bit.patch
-	# bug 227117
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-eof.patch
-
-	append-cppflags -DPIC
-	append-flags -fPIC -fno-strict-aliasing
-
-	dbver="$(db_findver sys-libs/db)"
-	sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS}/" \
-		-e "s/LDFLAGS=\"/LDFLAGS=\"${LDFLAGS} /" \
-		-e "s/libdb_cxx.so/libdb_cxx-${dbver}.so/" \
-		-e "s/bdblib=\"db_cxx\"/bdblib=\"db_cxx-${dbver}\"/" configure* || die
-
-	find . -name '*.in' | xargs sed -i \
-		-e "s#\(@prefix@/\)\(dat\|plugins\)#\1$(get_libdir)/xsim/\2#" \
-		-e "s#@prefix@/etc#/etc#" || die
-}
-
-src_configure() {
-	local myconf=""
-
-	use debug && myconf="--enable-debug"
-
-	econf \
-		--with-bdb-includes=$(db_includedir) \
-		--without-qt3 \
-		--without-kde3 \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		xsim_datp="${D}"/usr/$(get_libdir)/xsim/dat \
-		xsim_libp="${D}"usr/$(get_libdir)/xsim/plugins \
-		xsim_binp="${D}"/usr/bin \
-		xsim_etcp="${D}"/etc \
-		install install-data
-
-	dodoc ChangeLog KNOWNBUG README* TODO
-}
-
-pkg_postinst() {
-	elog "XSIM needs write access to /usr/$(get_libdir)/xsim/dat/chardb, so if you"
-	elog "not running it as root, you need to do the following:"
-	elog
-	elog "	cp -r /usr/$(get_libdir)/xsim/dat \${HOME}/.xsim"
-	elog "	sed -i \"s#DICT_LOCAL.*#DICT_LOCAL \${HOME}/.xsim#\" > \${HOME}/.xsim/xsimrc"
-	echo
-}
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@ -1,2 +1 @@
-DIST geoip-1.0.8.tgz 10061 SHA256 08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a SHA512 3a8a64f1d420472cc5b3a760391be28bd6bd8a34092715b0f75f308502fa76ca71a029cb2f0ba2fb87ba26166781547edbb7f151609c91db48bb025add4d0447 WHIRLPOOL a79497cd4f9fe0bc8c50138a1c17ff4b0d08b615f6458a8b48149dccfbb7d5927c6cdb47ece5127ae477796d5a7ca2e38139fe71266584a5874b043d6a12ff95
 DIST geoip-1.1.0.tgz 12714 SHA256 82c6deb7264d2ff7c4d6c45a7d27cff7ab097be965795e317e04a9c5b7be98b9 SHA512 8a0fc698a234d3b2c01f2a0c05c28025d98a5d3dce509ba19ee462abae0fd0f5631d96d3e8bba4fce6c23b278ec3875da5e8535971c7d880e2e307a097dc30a1 WHIRLPOOL f8ccf90958bdc0eee41f24b6ad04907884fed2efe2bca483fa816aceb46d15311325175b07f27d85085afdb5651fd071fd20b046ba42e30da26eea56a14912d6
--- a/dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.0.8-r2.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PHP_EXT_NAME="geoip"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README ChangeLog"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/geoip-1.4.0"
-RDEPEND="${DEPEND}"
--- a/dev-php/pecl-haru/pecl-haru-1.0.4-r1.ebuild
+++ b/dev-php/pecl-haru/pecl-haru-1.0.4-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-USE_PHP="php5-4 php5-5 php5-6"
+USE_PHP="php5-5 php5-6"

 inherit php-ext-pecl-r2

--- a/dev-php/pecl-haru/pecl-haru-1.0.4.ebuild
+++ b/dev-php/pecl-haru/pecl-haru-1.0.4.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_PHP="php5-4 php5-5"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="An interface to libharu, a PDF generator"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="png zlib"
-
-DEPEND="media-libs/libharu[png?,zlib?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# config.m4 is broken checking paths, so we need to override it
-	my_conf=""
-	use png && my_conf+=" --with-png-dir=/usr"
-	use zlib && my_conf+=" --with-zlib-dir=/usr"
-
-	php-ext-source-r2_src_configure
-}
--- a/dev-php/pecl-memcache/pecl-memcache-3.0.8.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64 hppa ppc64 x86"
-
-DESCRIPTION="PHP extension for using memcached"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session"
-
-DEPEND="sys-libs/zlib
-		dev-lang/php:*[session?]"
-RDEPEND="${DEPEND}"
-
-# upstream does not ship any testsuite, so the PHPize test-runner fails.
-RESTRICT='test'
-
-src_configure() {
-	my_conf="--enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session)"
-	php-ext-source-r2_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r2_src_install
-
-	php-ext-source-r2_addtoinifiles "memcache.allow_failover" "true"
-	php-ext-source-r2_addtoinifiles "memcache.max_failover_attempts" "20"
-	php-ext-source-r2_addtoinifiles "memcache.chunk_size" "32768"
-	php-ext-source-r2_addtoinifiles "memcache.default_port" "11211"
-	php-ext-source-r2_addtoinifiles "memcache.hash_strategy" "consistent"
-	php-ext-source-r2_addtoinifiles "memcache.hash_function" "crc32"
-	php-ext-source-r2_addtoinifiles "memcache.redundancy" "1"
-	php-ext-source-r2_addtoinifiles "memcache.session_redundancy" "2"
-	php-ext-source-r2_addtoinifiles "memcache.protocol" "ascii"
-}
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@ -1,3 +1,2 @@
 DIST memcached-1.0.2.tgz 22724 SHA256 16de77317e43b0a5bfd802c0bd2ef575adbad2093e8632d58738974e6cb14129 SHA512 02ccd76a540b86fbd392fcdb0bb632fa3d715b702ee90a10bd7a0330d9b181c7c4f1420bc60ffbcd1e0315fd602382a93b0d50aa8c7d1d9b9152868b60f595b3 WHIRLPOOL 674b1e9437b4cccce48810db5cb71961d88716c25e66b83e06307e718265a8de4053e3b260aa78f64a91c9f17779448f372217a85a4245c249957fbfcc32bec5
-DIST memcached-2.1.0.tgz 39095 SHA256 bc4940015be74f47908d410d7b55e10a3d5bf65674036d944c73558227fcc4af SHA512 47695ee2ba90861810b0b7dda06ea0b72931b1e0be28c99535a98d4644500cdd7719bc98ff0500b798af46f6fa78336084c61e24fef5235891937b679cfd58d6 WHIRLPOOL 3ae08a948c7ecf03d8c1fd71bcc9899eac46a89f633d74c78a5e8cddde0c923a54b035f1c99e0d08e49b7adb77dad7139adf61d6ccb8e6acfddd989e04809319
 DIST memcached-2.2.0.tgz 70449 SHA256 17b9600f6d4c807f23a3f5c45fcd8775ca2e61d6eda70370af2bef4c6e159f58 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356 WHIRLPOOL 1114a4c4371cfb42e3e4cb991980b32894f438abacf61c6da3dd6d9742c93e20df7691287c852c17dfe8261046227d73b1887c0b7b9c03a0e895a713005dc95a
--- a/dev-php/pecl-memcached/pecl-memcached-2.1.0-r2.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.1.0-r2.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PHP_EXT_NAME="memcached"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session igbinary json sasl"
-
-DEPEND="|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] )
-		sys-libs/zlib
-		dev-lang/php[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?] )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	my_conf="--enable-memcached
-		$(use_enable session memcached-session)
-		$(use_enable sasl memcached-sasl)
-		$(use_enable json memcached-json)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r2_src_configure
-}
--- a/dev-php/pecl-memcached/pecl-memcached-2.1.0-r3.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.1.0-r3.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PHP_EXT_NAME="memcached"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-5 php5-4"
-
-inherit base php-ext-pecl-r2
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session igbinary json sasl"
-
-DEPEND="|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] )
-		sys-libs/zlib
-		dev-lang/php[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?] )"
-RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/libmc-1.09-fix.diff" )
-
-src_prepare() {
-	local slot orig_s="${S}"
-	for slot in $(php_get_slots); do
-		export S="${WORKDIR}/${slot}"
-		cd "${S}"
-		base_src_prepare
-	done
-	export S="${orig_s}"
-	cd "${S}"
-	php-ext-source-r2_src_prepare
-}
-
-src_configure() {
-	my_conf="--enable-memcached
-		$(use_enable session memcached-session)
-		$(use_enable sasl memcached-sasl)
-		$(use_enable json memcached-json)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r2_src_configure
-}
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PHP_EXT_NAME="memcached"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-5 php5-6 php5-4"
-
-inherit base php-ext-pecl-r2
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension for interfacing with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE="+session igbinary json sasl"
-
-DEPEND="|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] )
-		sys-libs/zlib
-		dev-lang/php[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?,php_targets_php5-6?] )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	local slot orig_s="${S}"
-	for slot in $(php_get_slots); do
-		export S="${WORKDIR}/${slot}"
-		cd "${S}"
-		base_src_prepare
-	done
-	export S="${orig_s}"
-	cd "${S}"
-	php-ext-source-r2_src_prepare
-}
-
-src_configure() {
-	my_conf="--enable-memcached
-		$(use_enable session memcached-session)
-		$(use_enable sasl memcached-sasl)
-		$(use_enable json memcached-json)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r2_src_configure
-}
--- a/dev-php/pecl-mongo/Manifest
+++ b/dev-php/pecl-mongo/Manifest
@ -1,4 +1,3 @@
-DIST mongo-1.5.4.tgz 191364 SHA256 19d01417f0c96c10fb9149fc6cb5cc9c1f096e9c6fa31ee4c454f229e33dbd30 SHA512 509eb4f9dc0fd7617ec2f7616b1511266b91b804c0ec04ef5dcfbb9b1a77ec6e9acc3108dfe6b2607f4e97f6091dc2f94456900dcd7e64c85e2f754aafb65c05 WHIRLPOOL 4807844725f6221d130ec30c3ab47fc9da25286ce039568c58332d63412a73a663cb713dd346095acc5d6c539ac0e6c0cdbae80ad6582ef1473a5dc23fa24edf
 DIST mongo-1.5.6.tgz 193219 SHA256 939231c5129176f5f00ba6275dd34b261e173675b1e81a5fa536a14d05b12b11 SHA512 588915079ea08631ef60fce26bd86a0596003900b75c11af7935e57aa418220e21197aff4617f79808a5ee2bc0d74aba031f54f05be4604c6fc94ce146823c10 WHIRLPOOL c1c922750fa272cc2565d2377b65f5e25b2cb9e55f19abe94c34661e93d62b4162a8a18ef53b71b4c8e653778cc0d837930819b8ed79c6bbfd9690b35801f550
 DIST mongo-1.6.11.tgz 209141 SHA256 cd180ae35f537a199d374a3105106ee5a2b0cab618b12f6221e4c985c28955ac SHA512 82c668e25fd68c6a7982f15fced06c72d87deab5b587ebd66f3d78f59d9fc9c94467a37e355adffd98a347786effd9eda3e1104fc89c85c31947fd6786cbb1e8 WHIRLPOOL 3a4e181c3cd505d25fa18251d5d866e3f22535caa8213f90bb08adc803b527fc7ae0e0f9557a110dbfcea0717d5550cf2e1592be9e745f337675f35aaba08176
 DIST mongo-1.6.2.tgz 204061 SHA256 b9a1319910a3d91af94aec46b9dd0021e5b2504b199c60cc8b6075f8d3d78e7b SHA512 01118fd8f227c220c9c29749687cc33a6a56af1b8ed03f72e966d2ce4fd4e23048c6d0576d3c619b4e9e7c690892a05c665970bf8592170a8cb569a84094dd9d WHIRLPOOL cbef6dd822ef59301c4e534e4fe8a07bebdfbdf02f24b279ddf1c72c9ed27a5fafa81e9c20beb6687d049663ce2cf65777715d2e4c28aee65e848254ae0857c1
--- a/dev-php/pecl-mongo/pecl-mongo-1.5.4.ebuild
+++ b/dev-php/pecl-mongo/pecl-mongo-1.5.4.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PHP_EXT_NAME="mongo"
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="MongoDB database driver"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@ -1,3 +1,2 @@
-DIST rrd-1.1.0.tgz 18639 SHA256 3c31c9e07da55a57978a1e2801051ebfcad4a35fd1664e9bea63ecdfca0fcfdb SHA512 5d6887fbe5e9f5589ab3876ecb187159b10727f4cd64d4aaaf98442c737aaa9e43394d7795b1eb06d62dc253bb98d4c40ab37520ccf54850b3306ef14225619a WHIRLPOOL 4a7fab06d295cc4f0ebe96cd5bf68b12a889bd0048619ea9ad82639cb3ad08f4a9046102a164cd9c812f6e1c709998d4366fc94f2cb88ea465eac1c1769ebf0c
 DIST rrd-1.1.3.tgz 19229 SHA256 0415ac51e09fe2e7a999d155d10d6af42ddf40ab0b4847a63ed1f9458533858e SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242 WHIRLPOOL dbb3317985e47130ee03c4ba6284428d38e25849a8da9a3ada2437f4e5b276e79a104131a64aad0e244fe5b63d5d310d81bbbb090517efcd3b8a6e18992c1d6f
 DIST rrd-2.0.1.tgz 18880 SHA256 39f5ae515de003d8dad6bfd77db60f5bd5b4a9f6caa41479b1b24b0d6592715d SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3 WHIRLPOOL 52825f29b2eb8462d14d21d13c5b9f4d06057d4150a85eb8dead2c2dc1152fcbb2b14821940e851e7bf3cb4172f0735223a6ffa7ff8634bfd862e40eaecb4fae
--- a/dev-php/pecl-rrd/pecl-rrd-1.1.0.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-1.1.0.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_PHP="php5-4 php5-5"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-
-SLOT="0"
-
-DEPEND=">=net-analyzer/rrdtool-1.4.5-r1[graph]"
-RDEPEND="${DEPEND}"
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r1.ebuild
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_PHP="php5-5 php5-4"
-
-inherit php-ext-pecl-r2
-
-DESCRIPTION="An extension to track progress of a file upload"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/php[apache2]"
-
-pkg_postinst() {
-	elog "This extension is only known to work on Apache with mod_php."
-}
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@ -1,3 +1,2 @@
 DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
-DIST QScintilla-gpl-2.9.1.tar.gz 2490144 SHA256 79e9c39d51549061d3d489387bcee86ff20c1f746d1b25ac173d5165426eabaf SHA512 709a5251c9273c527740b138b099e42a57cefa4fcda34c04da11f4640b0ee53ca9a0a58752e963bc8c63933e382ac8a6e774965d838c9123c11c1c59a9d7100e WHIRLPOOL f47319c2cebd1fdf4ae95f26781ab52758ab698b1b72e9d7db4e081e6c27bb41ef1d1da0b450c1cefebf0a9f1c1a128d45c44ba490d2be1a77276f3e1bf75224
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
--- a/dev-python/qscintilla-python/qscintilla-python-2.9.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.9.1.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2016 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 python-r1 qmake-utils
-
-MY_P=QScintilla-gpl-${PV}
-
-DESCRIPTION="Python bindings for Qscintilla"
-HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
-SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.11.3[X,${PYTHON_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	~x11-libs/qscintilla-${PV}:=
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}/Python
-
-src_prepare() {
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"${PYTHON}" configure.py
-			--qmake="$(qt4_get_bindir)"/qmake
-			--destdir="$(python_get_sitedir)"/PyQt4
-			--sip-incdir="$(python_get_includedir)"
-			--pyqt=PyQt4
-			--no-timestamp
-			$(use debug && echo --debug)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake4 to respect toolchain, build flags, and prevent stripping
-		eqmake4
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-}
--- a/dev-ruby/mime-types/mime-types-2.6.2.ebuild
+++ b/dev-ruby/mime-types/mime-types-2.6.2.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc History-Types.rdoc README.rdoc"
--- a/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"

 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_RECIPE_DOC="none"
--- a/dev-ruby/stringex/Manifest
+++ b/dev-ruby/stringex/Manifest
@ -1,2 +1,3 @@
 DIST stringex-2.5.2.gem 128000 SHA256 27a8ee92a808a83284438e51ed391f3539ae6b39731b95cb4ad940974f6d0a94 SHA512 06905b5d59b40f59c0901bbaacbf303cd906be110cd69a4b8cc29cecd69b6aa73d80cee0c9c0e2014f662b9fca1611c0fe334fcba3c4fa686224dac94f4e0d41 WHIRLPOOL 21a66f7babd2424035e4874d9f5168736c81f6da8388764633d9618064998bfeb076076cfd0d9125583903be25070fa329c4e8fccd81ebb8f801c4447e6be7b4
 DIST stringex-2.6.0.gem 129536 SHA256 15611e3765430e6e4cb794d289be6bb7b8a8c873d3ff6fd7dbf8c222c68f7ff6 SHA512 a54bf6ab9fcb0a11f6e27a125e6b1d8a49fa0ef4ca703d512c99a20ad59316184017a30e8fede5e7df3449cac53a395f530dde2033d6b15ca540b2c51aab92eb WHIRLPOOL f9102672888332145cc7548f971d5cde6550391e155c4a27ec5796cfd6aa2cc92dcedd51d431705362fd5b7fe362a713aa718d5741eb35a56348a885f41426f6
+DIST stringex-2.6.1.gem 130048 SHA256 e19fcf32cc429a12d454b14db3a43a6227ee9da233b10240fe1572c9aae7ce65 SHA512 b2ca4de05a8a1e3ef9fa85324f2280a27de7ef04ac3eb0f76006e07d86e5fa0fc84acd4ee6d39f86416bc769cf4e2804421703533b8609a18228cdfeb769a841 WHIRLPOOL 41e78d6563c166bd2e933caee86d3f61538b60d643344a576c7d636d2664e885c95ff6fafaa42c0563aaf8b9ef8f246016523544dbf88bfc8686be2d34b4ddb1
--- a/dev-ruby/stringex/stringex-2.6.1.ebuild
+++ b/dev-ruby/stringex/stringex-2.6.1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_DOC_DIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extensions for Ruby's String class"
+HOMEPAGE="https://github.com/rsl/stringex"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+# we could rely on activerecord[sqlite3], but since we do not remove the
+# sqlite3 adapter from activerecord when building -sqlite3, it's easier
+# to just add another dependency, so the user doesn't have to change the
+# USE flags at all.
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/i18n-0.6.9:0.6
+		dev-ruby/redcloth
+		dev-ruby/test-unit:2
+		>=dev-ruby/activerecord-3
+		dev-ruby/sqlite3 )"
+
+all_ruby_prepare() {
+	sed -i -e '1agem "i18n", "~>0.6.9"' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	# rake seems to break this
+	ruby-ng_testrb-2 -Ilib -Itest test/unit/*/*_test.rb test/performance/*_test.rb || die "tests failed"
+}
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@ -2,7 +2,5 @@ DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86
 DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
-DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
-DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
 DIST cmake-3.6.0.tar.gz 6897636 SHA256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505 WHIRLPOOL 4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77
--- a/dev-util/cmake/cmake-3.3.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.2-r1.ebuild
@ -1,200 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz
-	http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=net-misc/curl-7.20.0-r1[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-	"${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		$(cmake-utils_use_build ncurses CursesDialog)
-	)
-
-	if use qt4 || use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/cmake-syntax.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/cmake-indent.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-util/cmake/cmake-3.4.3.ebuild
+++ b/dev-util/cmake/cmake-3.4.3.ebuild
@ -1,198 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( virtual/emacs )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
-
-	# respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# Cleanup args to extract only JOBS.
-	# Because bootstrap does not know anything else.
-	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
-	fi
-
-	tc-export CC CXX LD
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null
-
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    Qt4Deploy, which tries to break sandbox and ignores prefix
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# disable running of cmake in boostrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	cmake_src_bootstrap
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		$(cmake-utils_use_build ncurses CursesDialog)
-	)
-
-	if use qt4 || use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/cmake-syntax.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/cmake-indent.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
+++ b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
@ -1,45 +0,0 @@
-Ensure that the correct version of Qt is always used.
-
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
-
-There is no guarantee to which version of Qt these symlinks might point, so it
-is necessary to find the correct version explicitly.
-
-Once qmake is found, it is queried for the correct location of all other items.
-
-Gentoo-bug: 547222
-
--- a/Modules/FindQt4.cmake
-+++ b/Modules/FindQt4.cmake
-@@ -482,13 +482,23 @@
- 
-   get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
- 
-  find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
-    PATHS
-      ENV QTDIR
-      "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
-    PATH_SUFFIXES bin
-    DOC "The qmake executable for the Qt installation to use"
-  )
-+  if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
-+    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
-+      PATHS
-+        /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
-+        /usr/bin
-+        NO_DEFAULT_PATH
-+      DOC "The qmake executable for the Qt installation to use"
-+    )
-+  else()
-+    find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
-+      PATHS
-+        ENV QTDIR
-+        "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
-+      PATH_SUFFIXES bin
-+      DOC "The qmake executable for the Qt installation to use"
-+    )
-+  endif()
- 
-   set(major 0)
-   if (QT_QMAKE_EXECUTABLE)
--- a/kde-apps/kde4-l10n/files/kde4-l10n-16.04.1-remove-dirs
+++ b/kde-apps/kde4-l10n/files/kde4-l10n-16.04.1-remove-dirs
@ -1,43 +0,0 @@
-# Disable any subdirectories listed here. Comments are ignored
-# First argument: parent directory
-# Second argument: which subdirectory to disable in CMakeLists.txt
-# kde-l10n 5
-data/kdeedu khangman
-docs/applications kate
-docs/applications konsole
-docs/applications kwrite
-docs/kde-runtime glossary
-docs/kde-runtime khelpcenter
-docs/kdeedu kig
-docs/kdeedu parley
-docs/kdeedu step
-docs/kdegames bomber
-docs/kdegraphics gwenview
-docs/kdegraphics kruler
-docs/kdesdk kapptemplate
-docs/kdesdk okteta
-docs/kdesdk umbrello
-docs/kdeutils kwalletmanager
-scripts kdeedu
-# Plasma 5
-docs kde-workspace
-docs/kde-runtime fundamentals
-docs/kde-runtime kdesu
-docs/kde-runtime khelpcenter
-docs/kde-runtime knetattach
-docs/kde-runtime onlinehelp
-docs/kde-runtime/kcontrol bookmarks
-docs/kde-runtime/kcontrol cookies
-docs/kde-runtime/kcontrol ebrowsing
-docs/kde-runtime/kcontrol emoticons
-docs/kde-runtime/kcontrol icons
-docs/kde-runtime/kcontrol kcmcgi
-docs/kde-runtime/kcontrol nepomuk
-docs/kde-runtime/kcontrol smb
-docs/kde-runtime/kcontrol trash
-docs/kde-runtime/kcontrol useragent
-messages kde-workspace
-messages kdeplasma-addons
-# kdepim-l10n 5
-docs kdepim
-docs kdepimlibs
--- a/media-gfx/fbv/Manifest
+++ b/media-gfx/fbv/Manifest
@ -1 +0,0 @@
-DIST fbv-1.0b.tar.gz 18989 SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c SHA512 18c833894ab2da74dd0e124829221081ff226ce19e9c5eac2f8273faba3e72239a4291403df5c19a66cb442736a27dfc3472d474720ceff2b9af460e4f2f9e91 WHIRLPOOL f679e13e3bb426372a947f089d1f8b67cb9ea27b5dc3b74cfdf80e8578c611969b9f2755eccf944730123212427903479f87e557dd95f5b72ccf6024d730cf25
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.ebuild
@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="simple program to view pictures on a linux framebuffer device"
-HOMEPAGE="http://freshmeat.net/projects/fbv/"
-SRC_URI="http://s-tech.elsat.net.pl/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ppc64 sh x86"
-IUSE="gif jpeg png"
-
-RDEPEND="gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	png? ( media-libs/libpng )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/oob-segfault-fbv-${PV}.diff \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-cc.patch
-
-	sed -i -e 's:-lungif:-lgif:g' configure Makefile || die
-}
-
-src_configure() {
-	local myconf="--without-bmp"
-
-	use png || myconf="${myconf} --without-libpng"
-	use gif || myconf="${myconf} --without-libungif"
-	use jpeg || myconf="${myconf} --without-libjpeg"
-
-	./configure \
-		--cc="$(tc-getCC)" \
-		--libs="${LDFLAGS}" \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		${myconf} || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin fbv
-	doman fbv.1
-	dodoc ChangeLog README TODO VERSION
-}
--- a/media-gfx/fbv/files/fbv-1.0b-cc.patch
+++ b/media-gfx/fbv/files/fbv-1.0b-cc.patch
@ -1,97 +0,0 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# 
-# T2 SDE: package/.../fbv/cc.patch
-# Copyright (C) 2007 The T2 SDE Project
-# 
-# More information can be found in the files COPYING and README.
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- T2-COPYRIGHT-NOTE-END ---
-
-Imported from Atmel.
-
-  - Rene Rebe <rene@exactcode.de>
-
-diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure
--- fbv-1.0b/configure	2004-09-07 13:29:27.000000000 +0200
-+++ fbv-1.0b-avr32/configure	2006-05-04 11:10:06.000000000 +0200
-@@ -21,6 +21,7 @@
- unset png
- unset bmp
- unset dfb
-+unset CC
- 
- help(){
- cat << EOF >&2
-@@ -33,6 +34,7 @@
- General:
-   --help	print this message
-   --libs=LIBS	additional libraries required (try -lX11 for ungif, -lz for PNG)
-+  --cc=CC	specify compiler to use
-   
- Directory and file names:
-   --prefix=PREFIX	install files in PREFIX [/usr/local]
-@@ -53,7 +55,7 @@
- --long help,\
- prefix:,srcdir:,bindir:,\
- infodir:,mandir:,\
-without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \
-+without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
- -n "$BASENAME" -- "$@")
- 
- if [ $? != 0 ] ; then help ; exit 1 ; fi
-@@ -65,6 +67,7 @@
- 	case "$1" in
- 		-h|--help) help ; exit 0 ;;
- 		--libs) libs="$2"; shift 2 ;;
-+		--cc) CC="$2"; shift 2 ;;
- 		--prefix) prefix="$2" ; shift 2 ;;
- 		--srcdir) srcdir="$2" ; shift 2 ;;
- 		--bindir) bindir="$2" ; shift 2 ;;
-@@ -80,6 +83,7 @@
- 	esac
- done
- 
-+[ -z "$CC" ] && CC=cc
- [ -z "$prefix" ] && prefix="/usr/local"
- [ -z "$bindir" ] && bindir="${prefix}/bin"
- [ -z "$mandir" ] && mandir="${prefix}/man"
-@@ -106,12 +110,12 @@
- ungif="no"
- echo "libungif check" >>./config.log
- echo "  1st:" >>./config.log
-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
- if [ -e \$\$~test ]; then
- 	libs="-lungif $libs" ; ungif="yes"
- else
- 	echo "  2nd: -lX11 -L$xdir/lib" >>./config.log
-	cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
-+	$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
- 	if [ -e \$\$~test ]; then
- 	libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
- 	fi
-@@ -124,7 +128,7 @@
- echo -n "checking for libjpeg presence... "
- if [ "$jpeg" != "disabled" ]; then
- jpeg="no"
-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
- if [ -e \$\$~test ]; then
- 	libs="-ljpeg $libs" ; jpeg="yes"
- fi
-@@ -135,7 +139,7 @@
- echo -n "checking for libpng presence... "
- if [ "$png" != "disabled" ]; then
- png="no"
-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
-+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
- if [ -e \$\$~test ]; then
- 	libs="-lpng $libs" ; png="yes"
- fi
--- a/media-gfx/fbv/files/fbv-1.0b-libpng15.patch
+++ b/media-gfx/fbv/files/fbv-1.0b-libpng15.patch
@ -1,20 +0,0 @@
--- png.c
-+++ png.c
-@@ -69,7 +69,7 @@
-         fclose(fh); return(FH_ERROR_FORMAT);
-     }
-     rp=0;
-    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-         if(rp) free(rp);
-@@ -161,7 +161,7 @@
-         fclose(fh); return(FH_ERROR_FORMAT);
-     }
-     rp=0;
-    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-     {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-         if(rp) free(rp);
--- a/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff
+++ b/media-gfx/fbv/files/oob-segfault-fbv-1.0b.diff
@ -1,13 +0,0 @@
-Index: fb_display.c
-===================================================================
--- fb_display.c	(revision 4)
-+++ fb_display.c	(working copy)
-@@ -92,7 +92,7 @@
- #if 0
-     blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs, bp);
- #else
-    blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres_virtual, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp);
-+    blit2FB(fh, fbbuff, alpha, x_size, y_size, x_stride, var.yres, x_pan, y_pan, x_offs, y_offs + var.yoffset, bp);
- #endif
-     free(fbbuff);
-    
--- a/media-gfx/fbv/metadata.xml
+++ b/media-gfx/fbv/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="freshmeat">fbv</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/media-video/smtube/smtube-16.6.0-r1.ebuild
+++ b/media-video/smtube/smtube-16.6.0-r1.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="YouTube Browser for SMPlayer"
+HOMEPAGE="http://smplayer.sourceforge.net/smtube"
+SRC_URI="mirror://sourceforge/smplayer/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="qt5"
+
+# Some deps are deprecated, but the replacements (such as qtnetwork)
+# are not API compatible, so we'll do what we can here.
+DEPEND="qt5? (
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	)
+	!qt5? (
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	dev-qt/qtscript:4
+	)"
+RDEPEND="${DEPEND}
+	|| ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )"
+
+gen_translation() {
+	lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	if use qt5; then
+		eqmake5 src/${PN}.pro
+	else
+		eqmake4 src/${PN}.pro
+	fi
+	emake
+
+	cd "${S}"/src/translations
+	l10n_for_each_locale_do gen_translation
+}
+
+install_locale() {
+	insinto /usr/share/${PN}/translations
+	doins "${S}"/src/translations/${PN}_${1}.qm
+	eend $? || die "failed to install $1 translation"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu ${PN}.desktop
+	newicon icons/${PN}_64.png ${PN}.png
+	dodoc Changelog
+
+	l10n_for_each_locale_do install_locale
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 14 Jul 2016 19:10:46 +0000
+Fri, 15 Jul 2016 08:40:46 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 14 Jul 2016 19:10:46 +0000
+Fri, 15 Jul 2016 08:40:46 +0000
--- a/metadata/md5-cache/app-admin/puppet-agent-1.5.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-1.5.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=5
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what sys-apps/dmidecode selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.5.0-1xenial_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.5.0-1xenial_i386.deb )
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=fd6b39ff77c2592afd07cc0fe35851f0
--- a/metadata/md5-cache/app-admin/puppet-agent-1.5.1
+++ b/metadata/md5-cache/app-admin/puppet-agent-1.5.1
@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=5
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what sys-apps/dmidecode selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.5.1-1xenial_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.5.1-1xenial_i386.deb )
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=fd6b39ff77c2592afd07cc0fe35851f0
--- a/metadata/md5-cache/app-admin/puppet-agent-1.5.2
+++ b/metadata/md5-cache/app-admin/puppet-agent-1.5.2
@ -4,11 +4,11 @@ DESCRIPTION=general puppet client utils along with mcollective hiera and facter
 EAPI=5
 HOMEPAGE=https://puppetlabs.com/
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what sys-apps/dmidecode selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.5.2-1xenial_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/xenial/PC1/p/puppet-agent/puppet-agent_1.5.2-1xenial_i386.deb )
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=fd6b39ff77c2592afd07cc0fe35851f0
+_md5_=899e62fe6f5506fc13b8058a23e0277d
--- a/metadata/md5-cache/app-arch/p7zip-16.02
+++ b/metadata/md5-cache/app-arch/p7zip-16.02
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
+DESCRIPTION=Port of 7-Zip archiver for Unix
+EAPI=5
+HOMEPAGE=http://p7zip.sourceforge.net/
+IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+LICENSE=LGPL-2.1 rar? ( unRAR )
+RDEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+REQUIRED_USE=kde? ( wxwidgets )
+SLOT=0
+SRC_URI=mirror://sourceforge/p7zip/p7zip_16.02_src_all.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
+_md5_=cc536ef44959bc35661fe80697a24bb8
--- a/metadata/md5-cache/app-emulation/docker-1.12.0_rc4-r1
+++ b/metadata/md5-cache/app-emulation/docker-1.12.0_rc4-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup unpack
+DEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) dev-go/go-md2man btrfs? ( >=sys-fs/btrfs-progs-3.8 ) >=dev-lang/go-1.4.2:= virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=6
+HOMEPAGE=https://dockerproject.org
+IUSE=apparmor aufs btrfs +device-mapper experimental overlay seccomp
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) !app-emulation/docker-bin >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 >app-emulation/containerd-0.2.2 app-emulation/runc[apparmor?,seccomp?]
+RESTRICT=installsources strip
+SLOT=0
+SRC_URI=https://github.com/docker/docker/archive/v1.12.0-rc4.tar.gz -> docker-1.12.0_rc4.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=410af65e83505d93eb4a32dfb72ecfb4
--- a/metadata/md5-cache/app-emulation/docker-9999
+++ b/metadata/md5-cache/app-emulation/docker-9999
@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) s
 RESTRICT=installsources strip
 SLOT=0
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	golang-base	08fe6e0e2b4750daff8887a7f0e1f873	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8371ce98dae88a06f6634f637369efc1
+_md5_=38efcfd6784a2d32b688cca5a37036a9
--- a/metadata/md5-cache/app-i18n/xsim-0.3.9.4-r5
+++ b/metadata/md5-cache/app-i18n/xsim-0.3.9.4-r5
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=sys-libs/db-4.1 x11-libs/libX11 x11-libs/libXt >=sys-apps/sed-4
-DESCRIPTION=A simple and fast GB and BIG5 Chinese XIM server
-EAPI=5
-HOMEPAGE=http://developer.berlios.de/projects/xsim/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/db-4.1 x11-libs/libX11 x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://gentoo/xsim-0.3.9.4.tar.gz
-_eclasses_=db-use	a4966c7f4f7df444ead1212848c13cc9	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f859ac0cf1b9f483d815ab299eedb133
--- a/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r2
+++ b/metadata/md5-cache/dev-php/pecl-geoip-1.0.8-r2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/geoip-1.4.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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=PHP extension to map IP address to geographic places
-EAPI=5
-HOMEPAGE=http://pecl.php.net/geoip
-IUSE=php_targets_php5-5 php_targets_php5-4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=>=dev-libs/geoip-1.4.0 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/geoip-1.0.8.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=3a7fa3a4b3bc50c3b49c7ca28faaee60
--- a/metadata/md5-cache/dev-php/pecl-haru-1.0.4
+++ b/metadata/md5-cache/dev-php/pecl-haru-1.0.4
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libharu[png?,zlib?] !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
-DESCRIPTION=An interface to libharu, a PDF generator
-EAPI=5
-HOMEPAGE=http://pecl.php.net/haru
-IUSE=png zlib php_targets_php5-4 php_targets_php5-5
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=media-libs/libharu[png?,zlib?] php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
-REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-5 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/haru-1.0.4.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=ef650d86206c596a4050da3a7f32397c
--- a/metadata/md5-cache/dev-php/pecl-haru-1.0.4-r1
+++ b/metadata/md5-cache/dev-php/pecl-haru-1.0.4-r1
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libharu[png?,zlib?] !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
+DEPEND=media-libs/libharu[png?,zlib?] !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
 DESCRIPTION=An interface to libharu, a PDF generator
 EAPI=5
 HOMEPAGE=http://pecl.php.net/haru
-IUSE=png zlib php_targets_php5-4 php_targets_php5-5 php_targets_php5-6
+IUSE=png zlib php_targets_php5-5 php_targets_php5-6
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=media-libs/libharu[png?,zlib?] php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-5 php_targets_php5-6 )
+RDEPEND=media-libs/libharu[png?,zlib?] php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 )
+REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-6 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/haru-1.0.4.tgz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=ef846aa85f85c6c60311b61f8b2c3e19
+_md5_=1f2bbd7f0e1c30bffa2a274747027136
--- a/metadata/md5-cache/dev-php/pecl-memcache-3.0.8
+++ b/metadata/md5-cache/dev-php/pecl-memcache-3.0.8
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib dev-lang/php:*[session?] !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=PHP extension for using memcached
-EAPI=5
-HOMEPAGE=http://pecl.php.net/memcache
-IUSE=+session php_targets_php5-5 php_targets_php5-4
-KEYWORDS=amd64 hppa ppc64 x86
-LICENSE=PHP-3
-RDEPEND=sys-libs/zlib dev-lang/php:*[session?] php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://pecl.php.net/get/memcache-3.0.8.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=6ae87dd1dcd86bb7a1913cce3bc02159
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r2
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?] ) !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=PHP extension for interfacing with memcached via libmemcached library
-EAPI=4
-HOMEPAGE=http://pecl.php.net/memcached
-IUSE=+session igbinary json sasl php_targets_php5-5 php_targets_php5-4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?] ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/memcached-2.1.0.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=ebc8140767dc84ff9cd8d0f3870704c3
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r3
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.1.0-r3
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?] ) !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=PHP extension for interfacing with memcached via libmemcached library
-EAPI=4
-HOMEPAGE=http://pecl.php.net/memcached
-IUSE=+session igbinary json sasl php_targets_php5-5 php_targets_php5-4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?] ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/memcached-2.1.0.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=22429e63f5cc9531b061409e77634804
--- a/metadata/md5-cache/dev-php/pecl-memcached-2.2.0
+++ b/metadata/md5-cache/dev-php/pecl-memcached-2.2.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?,php_targets_php5-6?] ) !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=PHP extension for interfacing with memcached via libmemcached library
-EAPI=4
-HOMEPAGE=http://pecl.php.net/memcached
-IUSE=+session igbinary json sasl php_targets_php5-5 php_targets_php5-6 php_targets_php5-4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=|| ( >=dev-libs/libmemcached-1.0.14 >=dev-libs/libmemcached-1.0[sasl?] ) sys-libs/zlib dev-lang/php[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-5?,php_targets_php5-4?,php_targets_php5-6?] ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-6 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/memcached-2.2.0.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=697044bad5f9f9cf67fff19163c5f2f3
--- a/metadata/md5-cache/dev-php/pecl-mongo-1.5.4
+++ b/metadata/md5-cache/dev-php/pecl-mongo-1.5.4
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=MongoDB database driver
-EAPI=5
-HOMEPAGE=http://pecl.php.net/mongo
-IUSE=php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/mongo-1.5.4.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=17bae92deaf3193ba7ac10afc62a9611
--- a/metadata/md5-cache/dev-php/pecl-rrd-1.1.0
+++ b/metadata/md5-cache/dev-php/pecl-rrd-1.1.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] !<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
-DESCRIPTION=RRDtool bindings for PHP
-EAPI=5
-HOMEPAGE=http://pecl.php.net/rrd
-IUSE=php_targets_php5-4 php_targets_php5-5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=net-analyzer/rrdtool-1.4.5-r1[graph] php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
-REQUIRED_USE=|| ( php_targets_php5-4 php_targets_php5-5 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/rrd-1.1.0.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=77898d38044788ccfaacee7de102b0c4
--- a/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1-r1
+++ b/metadata/md5-cache/dev-php/pecl-uploadprogress-1.0.3.1-r1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=!<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 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-DESCRIPTION=An extension to track progress of a file upload
-EAPI=5
-HOMEPAGE=http://pecl.php.net/uploadprogress
-IUSE=php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php[apache2] php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
-REQUIRED_USE=|| ( php_targets_php5-5 php_targets_php5-4 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/uploadprogress-1.0.3.1.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=eba539de52c4cda2182a00b92b0570fb
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.9.1
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.9.1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.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(-)] >=dev-python/PyQt4-4.11.3[X,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-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.1:=
-DESCRIPTION=Python bindings for Qscintilla
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=debug python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sip-4.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(-)] >=dev-python/PyQt4-4.11.3[X,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-qt/qtcore:4 dev-qt/qtgui:4 ~x11-libs/qscintilla-2.9.1:=
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.9.1.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=40989f46cd2cad738c17c778a90d9880
--- a/metadata/md5-cache/dev-ruby/mime-types-2.6.2
+++ b/metadata/md5-cache/dev-ruby/mime-types-2.6.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest: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? ( 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/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] ) )
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) 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_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Provides a mailcap-like MIME Content-Type lookup for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT Artistic GPL-2
-RDEPEND=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 )
+RDEPEND=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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/mime-types-2.6.2.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=500c0fe9c77bce6a2fc5426873c3f819
+_md5_=7fc51ab95b36a075b74b69f44d9b7034
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
@ -1,14 +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] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby20] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[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] ) )
+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_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/maxitest[ruby_targets_ruby20] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby20] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/maxitest[ruby_targets_ruby21] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby21] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) 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_ruby23? ( dev-lang/ruby:2.3 ) 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_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) 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] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=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
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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 )
+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_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) 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_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.1.tar.gz -> rack-cache-1.6.1.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=599958b29740b25d7d2728c3ee95fff7
+_md5_=1e65be175fbd183906218c5514a853bd
--- a/metadata/md5-cache/dev-ruby/stringex-2.6.1
+++ b/metadata/md5-cache/dev-ruby/stringex-2.6.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby20] dev-ruby/redcloth[ruby_targets_ruby20] dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/activerecord-3[ruby_targets_ruby20] dev-ruby/sqlite3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby21] dev-ruby/redcloth[ruby_targets_ruby21] dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/activerecord-3[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/i18n-0.6.9:0.6[ruby_targets_ruby22] dev-ruby/redcloth[ruby_targets_ruby22] dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/activerecord-3[ruby_targets_ruby22] dev-ruby/sqlite3[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/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Extensions for Ruby's String class
+EAPI=5
+HOMEPAGE=https://github.com/rsl/stringex
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=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=0
+SRC_URI=mirror://rubygems/stringex-2.6.1.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e5d774303c4b5d0c8b59298f818814f4
--- a/metadata/md5-cache/dev-util/cmake-3.3.2-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.3.2-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Cross platform Make
-EAPI=5
-HOMEPAGE=http://www.cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt4 qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-SLOT=0
-SRC_URI=http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=ae546d539a7f1955dfc84f657b4cf2a2
--- a/metadata/md5-cache/dev-util/cmake-3.4.3
+++ b/metadata/md5-cache/dev-util/cmake-3.4.3
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) doc? ( dev-python/sphinx ) sys-devel/make test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Cross platform Make
-EAPI=5
-HOMEPAGE=http://www.cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt4 qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=CMake
-RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-SLOT=0
-SRC_URI=http://www.cmake.org/files/v3.4/cmake-3.4.3.tar.gz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
-_md5_=a3fd66cc99e67c32d4afe584a4dddeea
--- a/metadata/md5-cache/media-gfx/fbv-1.0b
+++ b/metadata/md5-cache/media-gfx/fbv-1.0b
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng )
-DESCRIPTION=simple program to view pictures on a linux framebuffer device
-EAPI=4
-HOMEPAGE=http://freshmeat.net/projects/fbv/
-IUSE=gif jpeg png
-KEYWORDS=~amd64 arm ~arm64 ~ppc ppc64 sh x86
-LICENSE=GPL-2
-RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng )
-SLOT=0
-SRC_URI=http://s-tech.elsat.net.pl/fbv/fbv-1.0b.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=d84366e40e83b076c677d06c36b6da10
--- a/metadata/md5-cache/media-video/smtube-16.6.0-r1
+++ b/metadata/md5-cache/media-video/smtube-16.6.0-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 ) !qt5? ( dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtscript:4 )
+DESCRIPTION=YouTube Browser for SMPlayer
+EAPI=5
+HOMEPAGE=http://smplayer.sourceforge.net/smtube
+IUSE=qt5 linguas_bg linguas_cs linguas_da linguas_de linguas_en_GB linguas_en linguas_es linguas_eu linguas_fr linguas_gl linguas_he_IL linguas_hr linguas_hu linguas_it linguas_ja linguas_ko linguas_ms linguas_nn_NO linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sq linguas_sr linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 ) !qt5? ( dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtscript:4 ) || ( media-video/smplayer[streaming] media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )
+SLOT=0
+SRC_URI=mirror://sourceforge/smplayer/smtube-16.6.0.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	l10n	e26ea0642846685782f1813642e7ff0f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=32f713eb1b2431fec49e8e6da9901063
--- a/metadata/md5-cache/net-analyzer/wireshark-2.0.2
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.0.2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=5
-HOMEPAGE=http://www.wireshark.org/
-IUSE=adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark cpu_flags_x86_sse4_2 ssl zlib +filecaps
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
-SLOT=0/2.0.2
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.0.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=44219b71208872928342d32dfdbccd24
--- a/metadata/md5-cache/net-analyzer/wireshark-2.1.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.1.1
@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
-SLOT=0/2.1.0
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.1.0.tar.bz2
+SLOT=0/2.1.1
+SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.1.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	792f83d5ec9536cb5ccef375469d8bde	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	user	906f3c8eb3a2350a4f1191a89baa3e46
 _md5_=12f0429d8d30d357cf71c1b11e8233fd
--- a/metadata/md5-cache/net-misc/flexget-1.2.346-r1
+++ b/metadata/md5-cache/net-misc/flexget-1.2.346-r1
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/feedparser-5.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/beautifulsoup-4.1:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/beautifulsoup-4.4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/beautifulsoup-4.2.0 >=dev-python/html5lib-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyRSS2Gen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pynzb[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpyc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-dateutil-2.2 >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-tvrage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tmdb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/path-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/guessit-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/APScheduler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/feedparser-5.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/beautifulsoup-4.1:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/beautifulsoup-4.4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/beautifulsoup-4.2.0 >=dev-python/html5lib-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyRSS2Gen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pynzb[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpyc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-dateutil-2.2 >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-tvrage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tmdb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/path-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/guessit-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/guessit-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/APScheduler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Multipurpose automation tool for content like torrents, nzbs, podcasts, comics
 EAPI=5
 HOMEPAGE=http://flexget.com/
 IUSE=test transmission python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/feedparser-5.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/beautifulsoup-4.1:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/beautifulsoup-4.4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/beautifulsoup-4.2.0 >=dev-python/html5lib-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyRSS2Gen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pynzb[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpyc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-dateutil-2.2 >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-tvrage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tmdb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/path-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/guessit-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/APScheduler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] transmission? ( dev-python/transmissionrpc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/feedparser-5.1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.999[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/beautifulsoup-4.1:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/beautifulsoup-4.4:4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/beautifulsoup-4.2.0 >=dev-python/html5lib-0.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyRSS2Gen[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pynzb[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpyc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/requests-2.99[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-dateutil-2.2 >=dev-python/jsonschema-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-tvrage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tmdb3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/path-py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/guessit-0.9.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/guessit-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/APScheduler[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] transmission? ( dev-python/transmissionrpc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/FlexGet/FlexGet-1.2.346.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9e2fa8eb85c2eec708b948c125d8066c
+_md5_=86dc3b7b79508d541e841e23aab07be5
--- a/metadata/md5-cache/net-misc/lldpd-0.9.4
+++ b/metadata/md5-cache/net-misc/lldpd-0.9.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig doc? ( graph? ( app-doc/doxygen[dot] ) !graph? ( app-doc/doxygen ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Implementation of IEEE 802.1ab (LLDP)
+EAPI=6
+HOMEPAGE=https://vincentbernat.github.com/lldpd/
+IUSE=cdp doc +dot1 +dot3 edp fdp graph jansson +lldpmed old-kernel sanitizers seccomp sonmp snmp static-libs readline xml zsh-completion
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libbsd >=dev-libs/libevent-2.0.5 snmp? ( net-analyzer/net-snmp[extensible(+)] ) xml? ( dev-libs/libxml2 ) jansson? ( dev-libs/jansson ) seccomp? ( sys-libs/libseccomp ) zsh-completion? ( app-shells/zsh )
+REQUIRED_USE=graph? ( doc )
+SLOT=0
+SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-0.9.4.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	user	906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=70ccb573e59bf372d6e0c5da84d34511
--- a/metadata/md5-cache/net-misc/netifrc-0.4.0
+++ b/metadata/md5-cache/net-misc/netifrc-0.4.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=kernel_linux? ( virtual/pkgconfig ) !<sys-fs/udev-172 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Gentoo Network Interface Management Scripts
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/proj/en/base/openrc/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+RDEPEND=sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~robbat2/distfiles/netifrc-0.4.0.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	udev	73058269b3e70e34e084fa3981282338
+_md5_=a1f3aad0e4899006cea6e684fbe7c6c2
--- a/metadata/md5-cache/net-misc/netifrc-9999
+++ b/metadata/md5-cache/net-misc/netifrc-9999
@ -7,4 +7,4 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	udev	73058269b3e70e34e084fa3981282338
-_md5_=9c237364c062d317edcdb7552c17ab89
+_md5_=a1f3aad0e4899006cea6e684fbe7c6c2
--- a/metadata/md5-cache/net-misc/tightvnc-1.3.10-r3
+++ b/metadata/md5-cache/net-misc/tightvnc-1.3.10-r3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jdk-1.4 ) x11-proto/xextproto x11-proto/xproto server? ( x11-proto/inputproto x11-proto/kbproto x11-proto/printproto ) >=x11-misc/imake-1 x11-misc/gccmakedep x11-misc/makedepend !net-misc/tigervnc java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A great client/server software package allowing remote network access to graphical desktops
+EAPI=5
+HOMEPAGE=http://www.tightvnc.com/
+IUSE=java tcpd server elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=media-fonts/font-misc-misc virtual/jpeg server? ( media-fonts/font-cursor-misc x11-apps/rgb x11-apps/xauth x11-apps/xsetroot ) x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXp x11-libs/libXt tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2 mirror://gentoo/tightvnc.png java? ( mirror://sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz )
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=df6e7c3b367cbab333523e74b6a79289
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.07.09.1
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.07.09.1
@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2016.07.09.1/youtube-dl-2016.07.09.1.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2016.07.13/youtube-dl-2016.07.13.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a899d50c46c53f7ab6a72a15f42571f3
--- a/metadata/md5-cache/sys-apps/dmtcp-1.2.6
+++ b/metadata/md5-cache/sys-apps/dmtcp-1.2.6
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=sys-libs/readline app-arch/gzip sys-kernel/linux-headers emacs? ( dev-lisp/clisp ) mpi? ( virtual/mpi ) || ( app-shells/dash app-shells/zsh app-shells/tcsh ) sys-devel/patch
-DESCRIPTION=DMTCP is the Distributed MultiThreaded Checkpointing tool
-EAPI=4
-HOMEPAGE=http://dmtcp.sourceforge.net/index.html
-IUSE=debug emacs fast mpi trace
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=sys-libs/readline app-arch/gzip sys-kernel/linux-headers emacs? ( dev-lisp/clisp ) mpi? ( virtual/mpi ) || ( app-shells/dash app-shells/zsh app-shells/tcsh )
-SLOT=0
-SRC_URI=mirror://sourceforge/dmtcp/dmtcp-1.2.6.tar.gz
-_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=c1698de21443c5a049158ad3b54bb9d8
--- a/metadata/md5-cache/sys-apps/tuned-2.6.0-r2
+++ b/metadata/md5-cache/sys-apps/tuned-2.6.0-r2
@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
+EAPI=5
+HOMEPAGE=https://fedorahosted.org/tuned/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sys-apps/dbus sys-power/powertop dev-util/systemtap
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://fedorahosted.org/releases/t/u/tuned/tuned-2.6.0.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=519c65c5e6001421cd17cc56f3f2a7e0
--- a/metadata/md5-cache/sys-cluster/nova-13.0.0
+++ b/metadata/md5-cache/sys-cluster/nova-13.0.0
--- a/metadata/md5-cache/sys-cluster/nova-13.1.0
+++ b/metadata/md5-cache/sys-cluster/nova-13.1.0
--- a/metadata/md5-cache/www-apps/dokuwiki-20160626a
+++ b/metadata/md5-cache/www-apps/dokuwiki-20160626a
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=DokuWiki is a simple to use Wiki aimed at a small company's documentation needs.
+EAPI=5
+HOMEPAGE=http://wiki.splitbrain.org/wiki:dokuwiki
+IUSE=gd vhosts
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-5.3[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) >=app-admin/webapp-config-1.50.15
+SLOT=20160626a
+SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2016-06-26a.tgz
+_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=572971ee3f188a177460306792c067ba
--- a/metadata/md5-cache/www-apps/drupal-7.50
+++ b/metadata/md5-cache/www-apps/drupal-7.50
@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=5
+HOMEPAGE=https://www.drupal.org/
+IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=7.50
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.50.tar.gz
+_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=1aa7d2a554b8e531a96d73f471885e6e
--- a/metadata/md5-cache/www-apps/drupal-8.1.5
+++ b/metadata/md5-cache/www-apps/drupal-8.1.5
@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=PHP-based open-source platform and content management system
+EAPI=5
+HOMEPAGE=https://www.drupal.org/
+IUSE=+accelerator +mysql postgres sqlite +uploadprogress vhosts
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=8.1.5
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.1.5.tar.gz
+_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=d90119129328b8b4e32bdc0ec26091ea
--- a/metadata/md5-cache/x11-libs/qscintilla-2.9.1
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.9.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=>=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtgui-4.8.5:4 designer? ( >=dev-qt/designer-4.8.5:4 )
-DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
-EAPI=5
-HOMEPAGE=http://www.riverbankcomputing.com/software/qscintilla/intro
-IUSE=designer doc
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtgui-4.8.5:4 designer? ( >=dev-qt/designer-4.8.5:4 )
-SLOT=0/12
-SRC_URI=mirror://sourceforge/pyqt/QScintilla-gpl-2.9.1.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=a8f2eeb0f9600919bdf88ac8a3d0fa03
--- a/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
+++ b/metadata/md5-cache/x11-libs/snorenotify-0.7.0-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 ) dev-qt/linguist-tools:5 kde-frameworks/extra-cmake-modules test? ( dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Multi platform Qt notification framework
+EAPI=6
+HOMEPAGE=https://techbase.kde.org/Projects/Snorenotify
+IUSE=sound test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 sound? ( dev-qt/qtmultimedia:5 )
+SLOT=0
+SRC_URI=mirror://kde/stable/snorenotify/0.7.0/src/snorenotify-0.7.0.tar.xz
+_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=1058db2ef519759ca118d83bd0add719
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Thu, 14 Jul 2016 19:10:46 +0000
+Fri, 15 Jul 2016 08:40:46 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Thu Jul 14 19:09:51 UTC 2016
+Fri Jul 15 08:39:51 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Thu, 14 Jul 2016 19:30:01 +0000
+Fri, 15 Jul 2016 09:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1468523401 Thu 14 Jul 2016 07:10:01 PM UTC
+1468572001 Fri 15 Jul 2016 08:40:01 AM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Thu, 14 Jul 2016 19:10:46 +0000
+Fri, 15 Jul 2016 08:40:46 +0000
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@ -1,3 +1,2 @@
-DIST wireshark-2.0.2.tar.bz2 31073440 SHA256 e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1 SHA512 a3645f0c2600091d3af76d12db4b73f83e6af4686a1bd7a336a420e4d7505ed281dfabb05c05cd6f58084fa3f25b6b9014b6f273b875c713ee39c77b4c5c715f WHIRLPOOL 4041698412d96ce495e2b564c897b4d770eea1851e431b43b2ef1bc6834bf57460ace5cc2e3f9ae6e05babbbec85e096ee1a87bc68211677202215c4dd0b53e5
 DIST wireshark-2.0.4.tar.bz2 31121258 SHA256 9ea9c82da9942194ebc8fc5c951a02e6d179afa7472cb6d96ca76154510de1a5 SHA512 f86c41ba9fb25ea61f3947819676417f7af64301cdd37c91666d59b179c45d76c1d0e8739ef6bcf3bb077d3216a65458b3d56755dd08f1fb05cc87cb810f8a07 WHIRLPOOL 2a495221cc1e28283ca19c181fb531fbd01194dd9a0ce9ab6df2a50ce0e19dc21ff5fe023d08a88ebcbb2bfe2a55d47e173401bc09ff8f5356e695fb4cacb12b
-DIST wireshark-2.1.0.tar.bz2 32605482 SHA256 f73bd7660056c0910c8a89f480f61ab9fe62866eadf1af49e3374da3fe16b4cc SHA512 9882014f4cb4f78034c4471f7667f9accdc32dd4c22b8ea799da7a0f2ad1bb7aaa47308ece503cd4e1955903138c06f219f309c8c6216f64d1e9c8747f118154 WHIRLPOOL 0ba0cca898bf4f302fabbe0f8dbc0fb7ff050c4dfb988d9d9622b97ae48fc3ca342f260136b1d2fc667407633817c09f5b5d7624081c2c59bdf7559339f03164
+DIST wireshark-2.1.1.tar.bz2 32212684 SHA256 8f5e604e8e0bc1f5562b166818f7a247f1b4d1f2ed15614138cc82fedad607e5 SHA512 216a0f661d271361d6388c74d52add917ec8701f58ae1a7b0ea115c4028240ad1c911fd74e9d8fe78bca4088228afcbcfb5a610827683552b3bc2bc1c77a249e WHIRLPOOL 83f1941146b8487f1644b1e8e8b8ced8ded1b16d53db9c4316808474f11121acd704f66c2f97d456a0a817f5b127380c834ed9924f58421ad3c9ef2b0e9cd70f
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST xsim-0.3.9.4.tar.gz 1025640 SHA256 048f23527543b21c4d52dc98967ec7253c34eb704056767364c6dc5007971b2c SHA512 07955cf68cc060724db5fdf04f2f55a93dfe29064b63170bb3c090443aa617de5d76ddd5cda971b16833fd2e090aa78a3bbc0c85e9eb2b4716dfa90c994fc8d3 WHIRLPOOL 9de70a58279849d8e370d96f97459d866ca213feeeed16f00ddcd48d003f994999da26e635c718ffd9da8291c8c97bfe043df851ef809ee6e888492f7bcda8e7`
				`@ -1 +0,0 @@`
				`DIST fbv-1.0b.tar.gz 18989 SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c SHA512 18c833894ab2da74dd0e124829221081ff226ce19e9c5eac2f8273faba3e72239a4291403df5c19a66cb442736a27dfc3472d474720ceff2b9af460e4f2f9e91 WHIRLPOOL f679e13e3bb426372a947f089d1f8b67cb9ea27b5dc3b74cfdf80e8578c611969b9f2755eccf944730123212427903479f87e557dd95f5b72ccf6024d730cf25`