Sync with portage [Fri Jun 24 09:30:45 MSK 2016].

8 years ago · 325680cc3f
parent 4d3acc83d8
commit 325680cc3f
81 changed files with 1231 additions and 993 deletions
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@ -1,2 +1,2 @@
-DIST puppet-lint-0.3.2.gem 32768 SHA256 ac3051cf39e27fd8ea80a60cb6ca63451b36de3cc2aa0fc768eea8906774da0d SHA512 87a85186f768b48d1043ce2ecc87fd3d3a2aa2ce9a52f91a3a35982310cb88241306eb5bf97f182a1af0928d2a2d6fc278e33dc94849a1f989007958c0c2e7b3 WHIRLPOOL b38c83d84a496a8e5230250293000c796935d0618ee7e0a98db3b7fa752f16364b884f7a8c37fabb710ba047b5a653118f57de0676ac86eeea66e52f3d632b9a
 DIST puppet-lint-1.1.0.gem 43520 SHA256 739f566cd4f1e77b92c1191217fdb59ce12353f3ec2703f30933d2bba877b35b SHA512 65b72ace2d5d9d22994ef9ed2ae2d544c4bf7d24a16b573e04b14668de69c56139949a936ed607045e5a6f11d0260a4d2773b2faab296e21f2e6b81e44f9be6a WHIRLPOOL 5d94bed7cee54617ccf68297dd9668832ea042bb818348e1482a5dea4843e7c2fbc76493ee2ae2ae003735daa09238650ab6b7e47111ad63808a12c87b0b62cf
+DIST puppet-lint-2.0.0.gem 46080 SHA256 90f2b3c84cd569aebd9b3f2709bd59c0b92e0357098fb882480d3e52e3a7df2a SHA512 e4576e50f66fa1c4e5e0c23f9f764ba954aacddfb9f6b69c58e44911aa56fa019d7a0ca631afd523fcf1519dc3d377b376788a2b82afda5e568506423c8c25c8 WHIRLPOOL df2e12eef7708e15c4f7649baab2481e386ee36df7400ebd3f295b59fd3fd32a1ecf4ba6c35da6ea83c05b288e4396c3de18c5c450119153e5005311f3a22753
--- a/app-admin/puppet-lint/puppet-lint-2.0.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.0.0.ebuild
@ -2,12 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="4"
+EAPI=5
 USE_RUBY="ruby20 ruby21"

-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README*"
-RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"

 inherit eutils ruby-fakegem

@ -19,4 +20,6 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64"

-ruby_add_rdepend "dev-ruby/rake"
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1 )"
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@ -1 +1 @@
-DIST stow-2.2.0.tar.gz 479109 SHA256 8b89d79939cf9ae87d2f223bb36a3b2d0c66775b62aeb9953c6d33dab40d3c2b SHA512 43de6eddd6d8323682c6f5d4de00131009b7685a937c2a88ea1596cf9e12ced073983af571255d90c6e205c60dd976668f067909c92a9bce8ba0dfd984b253be WHIRLPOOL 0148d5b8c152a2058c5856c3b3503615860228fc12c19bd5f2a959b1cd756e51df65fb26593f84d27b317c43b3d26eabe1cd3d365282fa8a6b0e04979afcf12c
+DIST stow-2.2.2.tar.gz 579324 SHA256 e2f77649301b215b9adbc2f074523bedebad366812690b9dc94457af5cf273df SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5 WHIRLPOOL 261899d7e9765e9c7de587e8084b714e6ed8ea90497fa813dbd8a309d17aa4b3edaf47436c2936c9a93d5338f32ffe8c0734b1c4c2e44ca39c8ace1da4ef0891
--- a/app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch
+++ b/app-admin/stow/files/stow-2.2.0-avoid-precedence-warning.patch
@ -1,13 +0,0 @@
--- lib/Stow.pm.in
-+++ lib/Stow.pm.in
-@@ -1734,8 +1734,8 @@ sub read_a_link {
-     }
-     elsif (-l $path) {
-         debug(4, "  read_a_link($path): real link");
-        return readlink $path
-            or error("Could not read link: $path");
-+        my $target = readlink $path or error("Could not read link: $path ($!)");
-+        return $target;
-     }
-     internal_error("read_a_link() passed a non link path: $path\n");
- }
--- a/app-admin/stow/stow-2.2.0-r2.ebuild
+++ b/app-admin/stow/stow-2.2.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -22,10 +22,6 @@ DEPEND="dev-lang/perl
 	)"
 RDEPEND="dev-lang/perl"

-src_prepare() {
-	epatch "${FILESDIR}/${P}-avoid-precedence-warning.patch"
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."

--- a/app-editors/atom/Manifest
+++ b/app-editors/atom/Manifest
@ -1,5 +1,6 @@
 DIST asar-0.10.0.tar.gz 975433 SHA256 49e743a952957aa22668b472ba926427f9e051ececeaadb922f8aff2bc8fd1ee SHA512 702fa0e496a1db55a61d7e00d55456f8703f7af00e458f26413771dc71cd03e9418e0334bb1a500aaabe14ab598e19c64612ebf6411c77e30004833c8d5d151e WHIRLPOOL a2e4f8563f779aea19357962f0ac0895005ff93a601d409a7b2c685348cba845106729e1f2a39f95001c186c0c0ba914d73ff1364d488e0853dbbabda0e80bb3
 DIST atom-1.7.4.rpm 64439092 SHA256 601ffa5d683b02cbd95bc65c76e28ecc091b7f12092b69c6e65eb93e941450e6 SHA512 4033c8bc36ba43332a1c7e08cf0fa5deaefb53152b7a56c8ca5f9c68bd88761fb54c57aa031c6702d46ce531cf1e9a8a24d2b7271fe0017a022bc4671d85d68d WHIRLPOOL 4adf85334482c49104bc6b1e96753f5c3d5243b799a6d745bd7770968d57b0ddaebee1fea382542a4219849f360f04d6ffc9d0eede5f6eb0d5e3ead3989fea03
+DIST atom-1.8.0.rpm 64364944 SHA256 7e9d64fd894ac8c307c377714cfb8d6ace44f80f09fec9222cd2e7858459a2d7 SHA512 1766cbb5a3cf544962a4adc2df4bc8de79d0ae8b90273e5798920f264dba100adf8f1bdfc2b7011c9d666f59bbc328dbf024ccab369ac76ebe6961c050f6e748 WHIRLPOOL 652a815a500cca79431a79dd43b8c0f73c3b7c7a387dc0bf5e89ef828df23670ab6a87df0737e66bd80b87ef474772ef31c27e17d014092ae33515ce1da10afc
 DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d WHIRLPOOL 573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4
 DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a WHIRLPOOL 4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937
 DIST atom-keyboard-layout-1.0.0.tar.gz 6430 SHA256 d3f20f0765b7a243c3cfa3e49360851404977c2ed6e84dc84e9aaf28d8547d03 SHA512 a96b77c29eb1f5367f1d60ddc501fdd6e507fc92f980974bb2c1bec923b264e73104650180722819946e075284a928b4aaa01f8594365186bd8530a0179c7ff5 WHIRLPOOL 693f4a1546e0ca772ea2b2f860e6c2cf55f645031eb516021107296a3a05fca9086de62080255abae55c0ea42cc0f5aeeba26e6dd0b7eb274a8b69135bbf79c9
--- a/app-editors/atom/atom-1.8.0.ebuild
+++ b/app-editors/atom/atom-1.8.0.ebuild
@ -0,0 +1,420 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic python-any-r1 eutils multiprocessing rpm
+
+DESCRIPTION="A hackable text editor for the 21st Century"
+HOMEPAGE="https://atom.io"
+MY_PV="${PV//_/-}"
+
+# All binary packages depend on this
+NAN_V=2.0.9
+
+# Keep dep versions in sync with atom/package.json
+CACHED_RUN_IN_THIS_CONTEXT_V=0.4.1
+GIT_UTILS_V=4.1.2
+NODEGIT_V=0.12.2
+NODE_NSLOG_V=3.0.0
+NODE_ONIGURUMA_V=5.1.2
+NODE_PATHWATCHER_V=6.2.4
+NODE_RUNAS_V=3.1.1
+SCROLLBAR_STYLE_V=3.2.0
+SPELL_CHECK_V=0.67.0
+
+# textbuffer dependency
+MARKER_INDEX_V=3.1.0
+
+# apm dependency
+NODE_KEYTAR_V=3.0.2
+
+# atom-keymap dependency
+KEYBOARD_LAYOUT_V=1.0.0
+
+# symbols-view dependency
+NODE_CTAGS_V=3.0.0
+
+# spell-check dependency
+NODE_SPELLCHECKER_V=3.2.3
+
+# nodegit dependencies
+PROMISIFY_NODE_V=0.4.0
+NODE_FS_EXTRA_V=0.26.2
+NODE_GRACEFUL_FS_V=4.1.2
+NODE_JSONFILE_V=2.1.0
+NODE_KLAW_V=1.0.0
+RIMRAF_V=2.2.8
+NODE_LODASH_V=3.10.1
+COMBYNE_V=0.8.1
+JS_BEAUTIFY_V=1.5.10
+NODEGIT_PROMISE_V=4.0.0
+ASAP_V=2.0.3
+OBJECT_ASSIGN_V=4.0.1
+
+ASAR_V=0.10.0
+
+# The x86_64 arch below is irrelevant, as we will rebuild all binary packages.
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/atom.x86_64.rpm -> atom-${MY_PV}.rpm
+	https://github.com/elprans/asar/releases/download/v${ASAR_V}-gentoo/asar-build.tar.gz -> asar-${ASAR_V}.tar.gz
+	https://github.com/nodejs/nan/archive/v${NAN_V}.tar.gz -> nodejs-nan-${NAN_V}.tar.gz
+	https://github.com/atom/cached-run-in-this-context/archive/v${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz -> atom-cached-run-in-this-context-${CACHED_RUN_IN_THIS_CONTEXT_V}.tar.gz
+	https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz
+	https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz
+	https://github.com/nodegit/nodegit/archive/v${NODEGIT_V}.tar.gz -> nodegit-${NODEGIT_V}.tar.gz
+	https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz
+	https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz -> atom-marker-index-${MARKER_INDEX_V}.tar.gz
+	https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz
+	https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz
+	https://github.com/atom/node-oniguruma/archive/v${NODE_ONIGURUMA_V}.tar.gz -> atom-node-oniguruma-${NODE_ONIGURUMA_V}.tar.gz
+	https://github.com/atom/node-pathwatcher/archive/v${NODE_PATHWATCHER_V}.tar.gz -> atom-node-pathwatcher-${NODE_PATHWATCHER_V}.tar.gz
+	https://github.com/atom/node-runas/archive/v${NODE_RUNAS_V}.tar.gz -> atom-node-runas-${NODE_RUNAS_V}.tar.gz
+	https://github.com/atom/scrollbar-style/archive/v${SCROLLBAR_STYLE_V}.tar.gz -> atom-scrollbar-style-${SCROLLBAR_STYLE_V}.tar.gz
+	https://github.com/atom/node-spellchecker/archive/v${NODE_SPELLCHECKER_V}.tar.gz -> atom-node-spellchecker-${NODE_SPELLCHECKER_V}.tar.gz
+
+	https://github.com/nodegit/promisify-node/archive/${PROMISIFY_NODE_V}.tar.gz -> nodegit-promisify-node-${PROMISIFY_NODE_V}.tar.gz
+	https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-${NODEGIT_PROMISE_V}.tgz
+	https://registry.npmjs.org/lodash/-/lodash-${NODE_LODASH_V}.tgz -> node-lodash-${NODE_LODASH_V}.tgz
+	https://github.com/kriskowal/asap/archive/v${ASAP_V}.tar.gz -> node-asap-${ASAP_V}.tar.gz
+	https://github.com/sindresorhus/object-assign/archive/v${OBJECT_ASSIGN_V}.tar.gz -> node-object-assign-${OBJECT_ASSIGN_V}.tar.gz
+	https://github.com/jprichardson/node-fs-extra/archive/${NODE_FS_EXTRA_V}.tar.gz -> node-fs-extra-${NODE_FS_EXTRA_V}.tar.gz
+	https://github.com/jprichardson/node-jsonfile/archive/${NODE_JSONFILE_V}.tar.gz -> node-jsonfile-${NODE_JSONFILE_V}.tar.gz
+	https://github.com/jprichardson/node-klaw/archive/${NODE_KLAW_V}.tar.gz -> node-klaw-${NODE_KLAW_V}.tar.gz
+	https://github.com/isaacs/node-graceful-fs/archive/v${NODE_GRACEFUL_FS_V}.tar.gz -> node-graceful-fs-${NODE_GRACEFUL_FS_V}.tar.gz
+	https://github.com/isaacs/rimraf/archive/v${RIMRAF_V}.tar.gz -> node-rimraf-${RIMRAF_V}.tar.gz
+	https://github.com/tbranyen/combyne/archive/${COMBYNE_V}.tar.gz -> node-combyne-${COMBYNE_V}.tar.gz
+	https://github.com/beautify-web/js-beautify/archive/v${JS_BEAUTIFY_V}.tar.gz -> node-js-beautify-${JS_BEAUTIFY_V}.tar.gz
+"
+
+BINMODS="
+		cached-run-in-this-context
+		node-ctags
+		git-utils
+		nodegit
+		keyboard-layout
+		node-nslog
+		node-oniguruma
+		node-pathwatcher
+		node-runas
+		node-keytar
+		scrollbar-style
+		node-spellchecker
+		marker-index
+"
+
+RESTRICT="mirror"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	!dev-util/apm
+	${PYTHON_DEPS}
+	>=app-text/hunspell-1.3.3:=
+	=dev-libs/libgit2-0.23*:=[ssh]
+	>=gnome-base/libgnome-keyring-3.12:=
+	>=dev-libs/oniguruma-5.9.5:=
+	>=dev-util/ctags-5.8
+	>=dev-util/electron-0.36.12-r3:0/36
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+get_install_dir() {
+	echo -n "/usr/$(get_libdir)/atom$(get_install_suffix)"
+}
+
+get_electron_dir() {
+	echo -n "/usr/$(get_libdir)/electron"
+}
+
+enode_electron() {
+	"$(get_electron_dir)"/node $@
+}
+
+enodegyp_atom() {
+	local apmpath="/usr/share/atom/resources/app/apm"
+	local nodegyp="${S}/${apmpath}/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"
+
+	PATH="$(get_electron_dir):${PATH}" \
+		enode_electron "${nodegyp}" \
+			--nodedir=/usr/include/electron/node/ $@ || die
+}
+
+easar() {
+	local asar="${WORKDIR}/$(package_dir asar)/node_modules/asar/bin/asar"
+	echo "asar" $@
+	enode_electron "${asar}" $@ || die
+}
+
+package_dir() {
+	local binmod="${1}" binmod_v
+	eval binmod_v=\${$(tr '[:lower:]' '[:upper:]' <<< ${binmod//-/_}_V)}
+	echo -n ${binmod}-${binmod_v}
+}
+
+_unpack_npm_package() {
+	local a="${1}" basename suffix
+
+	basename=${a%.*}
+	suffix=${basename##*.}
+	if [[ "${suffix}" == "tar" ]]; then
+		basename=${basename%.*}
+	fi
+
+	unpack ${a}
+	mv package "${basename}" || die
+}
+
+_have_patches_for() {
+	local _patches="${1}-*.patch" _find
+	_find=$(find "${FILESDIR}" -maxdepth 1 -name "${_patches}" -print -quit)
+	test -n "$_find"
+}
+
+src_unpack() {
+	local a
+
+	for a in ${A} ; do
+		case ${a} in
+		*.rpm) srcrpm_unpack "${a}" ;;
+		nodegit-promise*|node-lodash*) _unpack_npm_package "${a}" ;;
+		*) unpack "${a}" ;;
+		esac
+	done
+
+	mkdir "${WORKDIR}/atom-${MY_PV}" || die
+	mv "${WORKDIR}/usr" "${WORKDIR}/atom-${MY_PV}" || die
+}
+
+src_prepare() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+	local patch binmod _s nan_s="${WORKDIR}/nan-${NAN_V}"
+
+	cd "${S}/usr/share/atom/resources/app" || die
+	epatch "${FILESDIR}/${PN}-python.patch"
+	epatch "${FILESDIR}/${PN}-unbundle-electron.patch"
+
+	sed -i -e "s|{{ATOM_PATH}}|$(get_electron_dir)/electron|g" \
+		./atom.sh \
+		|| die
+
+	sed -i -e "s|{{ATOM_RESOURCE_PATH}}|${install_dir}/app.asar|g" \
+		./atom.sh \
+		|| die
+
+	local env="export NPM_CONFIG_NODEDIR=/usr/include/electron/node/"
+	sed -i -e \
+		"s|\"\$binDir/\$nodeBin\" --harmony_collections|${env}\nexec $(get_electron_dir)/node|g" \
+			apm/bin/apm || die
+
+	rm apm/bin/node || die
+
+	sed -i -e "s|/usr/share/atom/atom|/usr/bin/atom|g" \
+		"${S}/usr/share/applications/atom.desktop" || die
+
+	cd "${S}" || die
+
+	for binmod in ${BINMODS}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		if _have_patches_for "${binmod}"; then
+			for patch in "${FILESDIR}"/${binmod}-*.patch; do
+				epatch "${patch}"
+			done
+		fi
+	done
+
+	# Unbundle bundled libs from modules
+
+	_s="${WORKDIR}/$(package_dir git-utils)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "git;libgit2;git2" "${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir node-oniguruma)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "onig_scanner;oniguruma;onig" "${_s}/binding.gyp" || die
+
+	_s="${WORKDIR}/$(package_dir node-spellchecker)"
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "spellchecker;hunspell;hunspell" "${_s}/binding.gyp" || die
+
+	for binmod in ${BINMODS}; do
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		mkdir -p "${_s}/node_modules" || die
+		ln -s "${nan_s}" "${_s}/node_modules/nan" || die
+	done
+
+	_s="${WORKDIR}/$(package_dir nodegit)"
+	ln -s "${WORKDIR}/$(package_dir node-fs-extra)" "${_s}/node_modules/fs-extra" || die
+	ln -s "${WORKDIR}/$(package_dir promisify-node)" "${_s}/node_modules/promisify-node" || die
+	ln -s "${WORKDIR}/$(package_dir combyne)" "${_s}/node_modules/combyne" || die
+	ln -s "${WORKDIR}/$(package_dir js-beautify)" "${_s}/node_modules/js-beautify" || die
+	ln -s "${WORKDIR}/$(package_dir node-lodash)" "${_s}/node_modules/lodash" || die
+
+	_s="${WORKDIR}/$(package_dir promisify-node)"
+	mkdir "${_s}/node_modules" || die
+	ln -s "${WORKDIR}/$(package_dir nodegit-promise)" "${_s}/node_modules/nodegit-promise" || die
+	ln -s "${WORKDIR}/$(package_dir object-assign)" "${_s}/node_modules/object-assign" || die
+
+	_s="${WORKDIR}/$(package_dir nodegit-promise)"
+	mkdir "${_s}/node_modules" || die
+	ln -s "${WORKDIR}/$(package_dir asap)" "${_s}/node_modules/asap" || die
+
+	_s="${WORKDIR}/$(package_dir node-fs-extra)"
+	mkdir "${_s}/node_modules" || die
+	ln -s "${WORKDIR}/$(package_dir node-graceful-fs)" "${_s}/node_modules/graceful-fs" || die
+	ln -s "${WORKDIR}/$(package_dir node-jsonfile)" "${_s}/node_modules/jsonfile" || die
+	ln -s "${WORKDIR}/$(package_dir node-klaw)" "${_s}/node_modules/klaw" || die
+	ln -s "${WORKDIR}/$(package_dir rimraf)" "${_s}/node_modules/rimraf" || die
+
+	# Unpack app.asar
+	easar extract "${S}/usr/share/atom/resources/app.asar" "${S}/build/app"
+
+	cd "${S}" || die
+
+	epatch "${FILESDIR}/atom-apm-path.patch"
+	epatch "${FILESDIR}/asar-require.patch"
+
+	sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \
+		"${S}/build/app/src/config-schema.js" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local binmod _s
+
+	_s="${WORKDIR}/$(package_dir nodegit)"
+	cd "${_s}" || die
+	enode_electron generate/scripts/generateJson.js || die
+	enode_electron generate/scripts/generateNativeCode.js || die
+
+	${EPYTHON} "${FILESDIR}/gyp-unbundle.py" \
+		--inplace --unbundle "nodegit;vendor/libgit2.gyp:libgit2;git2;ssh2" "${_s}/binding.gyp" || die
+
+	for binmod in ${BINMODS}; do
+		einfo "Configuring ${binmod}..."
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		enodegyp_atom configure
+	done
+}
+
+src_compile() {
+	local binmod _s x
+	local ctags_d="node_modules/symbols-view/vendor"
+	local jobs=$(makeopts_jobs) gypopts
+
+	gypopts="--verbose"
+
+	if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+		gypopts+=" --jobs ${jobs}"
+	fi
+
+	mkdir -p "${S}/build/modules/" || die
+
+	for binmod in ${BINMODS}; do
+		einfo "Building ${binmod}..."
+		_s="${WORKDIR}/$(package_dir ${binmod})"
+		cd "${_s}" || die
+		enodegyp_atom ${gypopts} build
+		x=${binmod##node-}
+		mkdir -p "${S}/build/modules/${x}"
+		cp build/Release/*.node "${S}/build/modules/${x}"
+	done
+
+	# Put compiled binary modules in place
+	_fix_binmods "${S}/build" "app"
+	_fix_binmods "${S}/usr/share/atom/resources" "app"
+
+	# Remove non-Linux vendored ctags binaries
+	rm "${S}/build/app/${ctags_d}/ctags-darwin" \
+	   "${S}/build/app/${ctags_d}/ctags-win32.exe" || die
+
+	# Re-pack app.asar
+	# Keep unpack rules in sync with build/tasks/generate-asar-task.coffee
+	cd "${S}/build" || die
+	x="--unpack={*.node,ctags-config,ctags-linux,**/node_modules/spellchecker/**,**/resources/atom.png}"
+	easar pack "${x}" "app" "app.asar"
+	cd "${S}" || die
+
+	# Replace vendored ctags with a symlink to system ctags
+	rm "${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+	ln -s "/usr/bin/ctags" \
+		"${S}/build/app.asar.unpacked/${ctags_d}/ctags-linux" || die
+}
+
+_fix_binmods() {
+	local _dir="${2}" _prefix="${1}" path relpath modpath mod depth link f d
+	local cruft
+
+	find "${_prefix}/${_dir}" -name '*.node' -print | while IFS= read -r path; do
+		f=$(basename "${path}")
+		d=$(dirname "${path}")
+	    relpath=${path#${_prefix}}
+		relpath=${relpath##/}
+		relpath=${relpath#W${_dir}}
+		modpath=$(dirname ${relpath})
+		modpath=${modpath%build/Release}
+		mod=$(basename ${modpath})
+
+		# must copy here as symlinks will cause the module loading to fail
+		cp -f "${S}/build/modules/${mod}/${f}" "${path}" || die
+		cruft=$(find "${d}" -name '*.a' -print)
+		if [ -n "${cruft}" ]; then
+			rm ${cruft} || die
+		fi
+	done
+}
+
+src_install() {
+	local install_dir="$(get_install_dir)"
+	local suffix="$(get_install_suffix)"
+
+	cd "${S}" || die
+
+	insinto "${install_dir}"
+
+	doins build/app.asar
+	doins -r build/app.asar.unpacked
+	doins -r usr/share/atom/resources/app
+
+	insinto /usr/share/applications/
+	newins usr/share/applications/atom.desktop "atom${suffix}.desktop"
+
+	insinto /usr/share/icons/
+	doins -r usr/share/icons/hicolor
+
+	exeinto "${install_dir}"
+	newexe usr/share/atom/resources/app/atom.sh atom
+	insinto /usr/share/licenses/"${PN}${suffix}"
+	doins usr/share/atom/resources/LICENSE.md
+	dosym "${install_dir}/atom" "/usr/bin/atom${suffix}"
+	fperms +x "${install_dir}/app/apm/bin/apm"
+	dosym "${install_dir}/app/apm/bin/apm" "/usr/bin/apm${suffix}"
+}
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@ -1 +1,2 @@
 DIST vagrant-1.8.1.tar.gz 2873082 SHA256 12cfa43eb82399d3dd1c3fd24691797fa30187fc142474580c72e5c9f83b9dfd SHA512 efbb74e26b4678075b1cbcc1a8e0bdef929f8c7de186dec1931a5cd52f944a046992491681573283c6cab7e48bf25fce86b0da96df17063d2398b69401fa0f08 WHIRLPOOL 237cbec487f820f00c8bd5b57c44c2f2ffd3b716988f64265124c52e3fe1ef696f93a5e61004ee7c57531bfb1765c47d56c53b61880c761ddf5efc5b6545c261
+DIST vagrant-1.8.4.tar.gz 1736344 SHA256 a5ded3bc343ac1f30e09decab0c844639de45b16578600bdc4a0cdfe73b4d223 SHA512 0465a2e9eea87d5e7a13666dad32b8d4bc0bcd3ebcd0a752ad330e6e2aaeeeaab37e139f1de6bad859b1e8088a7ad9e12f395b95e679e6babf86c38a470d8568 WHIRLPOOL 35124df7062c70a80bf77a73bc6b4d551a8a965dd3a75181510ebc78c985432ea9517c9d8573eea60534aff827d4ddf983bfc355ed9f8bcc799dd9773c2b89e9
--- a/app-emulation/vagrant/files/vagrant-1.8.4
+++ b/app-emulation/vagrant/files/vagrant-1.8.4
@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+#
+# This is a wrapper to properly execute Vagrant within the embedded
+# Vagrant installation directory. This sets up proper environmental variables
+# so that everything loads and compiles to proper directories.
+
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.8.4"' )"
+
+# Export GEM_HOME based on VAGRANT_HOME
+#
+# This needs to be set because Bundler includes gem paths
+# from RubyGems' Gem.paths.
+if [ -z $VAGRANT_HOME ]; then
+  VAGRANT_HOME=$(eval echo "~/.vagrant.d")
+fi
+export GEM_HOME="$VAGRANT_HOME/gems"
+
+# SSL certs
+export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
+
+# Export an environmental variable to say we're in a Vagrant
+# installer created environment.
+export VAGRANT_INSTALLER_ENV=1
+
+# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file
+# to locate plugins configuration file.
+export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant"
+export VAGRANT_INSTALLER_VERSION="2"
+
+# Determine the OS that we're on, which is used in some later checks.
+# It is very important we do this _before_ setting the PATH below
+# because uname dependencies can conflict on some platforms.
+OS=$(uname -s 2>/dev/null)
+
+# Export the OS as an environmental variable that Vagrant can access
+# so that it can behave better.
+export VAGRANT_DETECTED_OS="${OS}"
+
+VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
+VAGRANT_LAUNCHER="${VAGRANT_DIR}/lib/vagrant/pre-rubygems.rb"
+
+# Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
+export VAGRANT_EXECUTABLE
+
+# Call the actual Vagrant bin with our arguments
+exec ruby "${VAGRANT_LAUNCHER}" "$@"
--- a/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch
+++ b/app-emulation/vagrant/files/vagrant-1.8.4-install-plugins-in-isolation.patch
@ -0,0 +1,114 @@
+--- bin/vagrant
+++ bin/vagrant
+@@ -69,6 +69,11 @@
+ require "bundler"
+ begin
+   $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)
+# Invalidate the cached Gemfile.lock if necessary and try again
+rescue Bundler::GemNotFound
+  FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile") if File.exists? File.expand_path("~/.vagrant.d/Gemfile")
+  FileUtils.rm File.expand_path("~/.vagrant.d/Gemfile.lock") if File.exists? File.expand_path("~/.vagrant.d/Gemfile.lock")
+  $vagrant_bundler_runtime = Bundler.setup(:default, :plugins)  
+ rescue Bundler::GemNotFound
+   $stderr.puts "Bundler, the underlying system used to manage Vagrant plugins,"
+   $stderr.puts "is reporting that a plugin or its dependency can't be found."
+--- lib/vagrant/bundler.rb        2016-06-13 10:21:40.000000000 +0200
+++ lib/vagrant/bundler.rb     2016-06-23 08:19:22.466039136 +0200
+@@ -65,6 +65,13 @@
+       @configfile = tempfile("vagrant-configfile")
+       @configfile.close
+ 
+      # Ensure the path to user's Gemfile exists
+      gemfile = Vagrant.user_data_path.join("Gemfile")
+      unless File.exists? gemfile
+        FileUtils.mkdir_p(File.dirname(gemfile))
+        File.open(gemfile, 'w') {}
+      end
+
+       # Build up the Gemfile for our Bundler context. We make sure to
+       # lock Vagrant to our current Vagrant version. In addition to that,
+       # we add all our plugin dependencies.
+@@ -151,7 +158,7 @@
+ 
+     # Clean removes any unused gems.
+     def clean(plugins)
+-      gemfile    = build_gemfile(plugins)
+      gemfile    = build_gemfile(plugins, false, true)
+       lockfile   = "#{gemfile.path}.lock"
+       definition = ::Bundler::Definition.build(gemfile, lockfile, nil)
+       root       = File.dirname(gemfile.path)
+@@ -182,11 +189,23 @@
+     # Builds a valid Gemfile for use with Bundler given the list of
+     # plugins.
+     #
+    # @param [Hash|Bool] update Hash of gems to update or true for all
+    # @param [Bool] invalidate Invalidate Gemfile.lock
+     # @return [Tempfile]
+-    def build_gemfile(plugins)
+    def build_gemfile(plugins, update = false, invalidate = false)
+       sources = plugins.values.map { |p| p["sources"] }.flatten.compact.uniq
+ 
+-      f = tempfile("vagrant-gemfile")
+      # Determine what gems to update
+      if update.is_a? Hash
+        update_gems = update[:gems]
+      elsif update === true
+        update_gems = plugins.map{ |p| p[0] }
+      else
+        update_gems = []
+      end
+
+      gemfile = Vagrant.user_data_path.join("Gemfile")
+      f = File.open(gemfile, "w+")
+       f.tap do |gemfile|
+         sources.each do |source|
+           next if source == ""
+@@ -195,6 +214,19 @@
+ 
+         gemfile.puts(%Q[gem "vagrant", "= #{VERSION}"])
+ 
+        locked_gems = []
+
+        # Use Gemfile.lock to lock the gem versions
+        if ENV["VAGRANT_INTERNAL_BUNDLERIZED"] && File.exist?("#{gemfile.path}.lock") && !invalidate
+          lockfile = ::Bundler::LockfileParser.new(::Bundler.read_file("#{gemfile.path}.lock"))
+          lockfile.specs.each do |s|
+            if s.name != 'vagrant' && !(update_gems.include? s.name)
+              gemfile.puts(%Q[gem "#{s.name}", "#{s.version.to_s}"])
+            end
+          end
+          locked_gems = lockfile.specs.map(&:name) - update_gems
+        end
+
+         gemfile.puts("group :plugins do")
+         plugins.each do |name, plugin|
+           version = plugin["gem_version"]
+@@ -205,10 +237,18 @@
+             opts[:require] = plugin["require"]
+           end
+ 
+-          gemfile.puts(%Q[gem "#{name}", #{version.inspect}, #{opts.inspect}])
+          gemfile.puts(%Q[gem "#{name}", #{version.inspect}, #{opts.inspect}]) unless locked_gems.include? name
+         end
+         gemfile.puts("end")
+         gemfile.close
+
+        # Create Gemfile.lock if missing and re-generate Gemfile
+        if !File.exist?("#{f.path}.lock") && File.exist?(f.path)
+          lockfile = "#{f.path}.lock"
+          ENV['BUNDLE_GEMFILE'] = f.path
+          definition = ::Bundler::Definition.build(f.path, lockfile, false)
+        end
+        f
+       end
+     end
+ 
+@@ -219,7 +259,7 @@
+     #   can be a hash of options. See Bundler.definition.
+     # @return [Array<Gem::Specification>]
+     def internal_install(plugins, update, **extra)
+-      gemfile    = build_gemfile(plugins)
+      gemfile    = build_gemfile(plugins, update)
+       lockfile   = "#{gemfile.path}.lock"
+       definition = ::Bundler::Definition.build(gemfile, lockfile, update)
+       root       = File.dirname(gemfile.path)
--- a/app-emulation/vagrant/vagrant-1.8.4.ebuild
+++ b/app-emulation/vagrant/vagrant-1.8.4.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit bash-completion-r1 ruby-fakegem eutils
+
+DESCRIPTION="A tool for building and distributing development environments"
+HOMEPAGE="http://vagrantup.com/"
+SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+virtualbox"
+
+RDEPEND="${RDEPEND}
+	app-arch/libarchive
+	net-misc/curl
+	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+	>=dev-ruby/bundler-1.12.5
+	>=dev-ruby/childprocess-0.5.0
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/i18n-0.6.0:* <dev-ruby/i18n-0.8.0:*
+	>=dev-ruby/listen-3.0.2
+	>=dev-ruby/hashicorp-checkpoint-0.1.1
+	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
+	>=dev-ruby/net-ssh-3.0.1
+	>=dev-ruby/net-sftp-2.1
+	>=dev-ruby/net-scp-1.1.0
+	>=dev-ruby/rest-client-1.6.0 <dev-ruby/rest-client-2.0
+	>=dev-ruby/nokogiri-1.6.7.1
+	>=dev-ruby/mime-types-2.6.2:* <dev-ruby/mime-types-3:*
+"
+
+ruby_add_bdepend "
+	dev-ruby/rake
+"
+
+all_ruby_prepare() {
+	# remove bundler support
+	sed -i '/[Bb]undler/d' Rakefile || die
+	rm Gemfile || die
+
+	# loosen dependencies
+	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \
+		-e '/nokogiri\|bundler/s/=/>=/' \
+		-i ${PN}.gemspec || die
+
+	# remove windows-specific gems
+	sed -e '/wdm\|winrm/d' \
+		-i ${PN}.gemspec || die
+
+	# remove bsd-specific gems
+	sed -e '/rb-kqueue/d' \
+		-i ${PN}.gemspec || die
+
+	# see https://github.com/mitchellh/vagrant/pull/5877
+	epatch "${FILESDIR}"/${P}-install-plugins-in-isolation.patch
+
+	# disable embedded CA certs and use system ones
+	epatch "${FILESDIR}"/${PN}-1.8.1-disable-embedded-cacert.patch
+
+	# fix rvm issue (bug #474476)
+	epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch
+}
+
+all_ruby_install() {
+	newbashcomp contrib/bash/completion.sh ${PN}
+	all_fakegem_install
+
+	# provide executable similar to upstream:
+	# https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
+	newbin "${FILESDIR}/${P}" "${PN}"
+
+	# directory for plugins.json
+	dodir /var/lib/vagrant
+}
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@ -1,3 +1,4 @@
 DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c
 DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927
 DIST metagen-0.6.4.2.tar.bz2 6837 SHA256 b048deace35579b7cc2d7c6eb39aa869369e932220c2a3d3d01ca378b4baa18c SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c WHIRLPOOL 6d5d99a75300858f8ddf947c698109f98355a34db805395bad4211212ef11ce40455ab45174d3adc8faafe18374ac71fe6ff8c43f6db94c75c0ec353df6e44ac
+DIST metagen-0.6.5.tar.bz2 6973 SHA256 da376be075c68d07f42f94e7017090f469c04280f6450cb4ed6bc4bab577e0ab SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0 WHIRLPOOL b12d8a1dbf7b142de3b9bfb3363565fec70450b28d05c55cca95ecc91ca8a9d02ad5905a660428fd6064ac2589028f081ba5a5ab7d440d8f5ac672bf864c01e1
--- a/app-portage/metagen/metagen-0.6.5.ebuild
+++ b/app-portage/metagen/metagen-0.6.5.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@ -1 +1 @@
-DIST mpv-bash-completion-0.16.tar.gz 15023 SHA256 ceee842ad8498afc49c9a6ded424f2f301f681513a901d5efb6fd641ba163e10 SHA512 cdfc126a170026ac1c5654a43c6b155a648b090b4b0fed83494725c2d357d5c22dca3e43b2e6a8ea461db83c49880454d0bd8f7209b01d7c9bcdd232d532abd0 WHIRLPOOL 17b29f79435033fefb1800f28c6d1d37506d116cab49bdc06470a6ff792a4009e624a2150bdca2eeaa04756238e314e7277a9b34c6241e9845e8cdd76267df82
+DIST mpv-bash-completion-0.17.tar.gz 15033 SHA256 a4c3be027ec52fef684a545a43c05f32cf512da93ae4a569d273e6e182b90ab1 SHA512 851a9f2b5e54f176fc7519a5fceace2b3281bef4062a48e108f17b83ccbd53e7b7545969be9cbccd3f093ba9ee65bd6736650f1b4d88997808a8b1df40d769eb WHIRLPOOL ba077f686d2e9ba4e819cf30f17cdca5b98b321e6c39b72a3bd7c1f5269da3d20abe7f610838a51b941fdba8c6636fc3eaae81f07fcd08f8f61f6262d2d0fab5
--- a/app-shells/mpv-bash-completion/files/mpv-bash-completion-0.16-fix-no-flag-options-completion.patch
+++ b/app-shells/mpv-bash-completion/files/mpv-bash-completion-0.16-fix-no-flag-options-completion.patch
@ -1,30 +0,0 @@
-commit 3a5d3b89ecb3a05b58ad8d160a35c0795daf0c9a
-Author: Jens John <dev@2ion.de>
-Date:   Sun Feb 7 20:35:17 2016 +0900
-
-Fix completion of --no-* patterned options
---
-
-diff --git a/BUGS b/BUGS
-deleted file mode 100644
-index 337eb25..0000000
--- a/BUGS
-+++ /dev/null
-@@ -1,4 +0,0 @@
-- Options of type 'Flag' with no default and no [nocfg] marker are
-  not being completed correctly (exmaple: --no-audio). The completion
-  wrongly suggests to complete them in the format --no-audio=*, but
-  these options do not accept a yes/no flag.
-diff --git a/gen.sh b/gen.sh
-index 87e7e35..596f349 100755
--- a/gen.sh
-+++ b/gen.sh
-@@ -149,7 +149,7 @@ for line in $(mpv --list-options \
-         "$(printf "$template_case" "$key" "$tail")")
-       ;;
-     Flag)
-      if [[ $line =~ \[nocfg\] || $line =~ \[global\] ]] ; then
-+      if [[ $line =~ \[nocfg\] || $line =~ \[global\] || $key =~ --no- ]] ; then
-         _allkeys="$_allkeys $key"
-       else
-         _allkeys="$_allkeys ${key}="
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-0.17.ebuild
+++ b/app-shells/mpv-bash-completion/mpv-bash-completion-0.17.ebuild
@ -15,15 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""

-DEPEND="
-	media-video/mpv[cli]
-	!<app-shells/bash-4
-"
+DEPEND="media-video/mpv[cli]"
 RDEPEND="${DEPEND}
 	>=app-shells/bash-completion-2.3-r1
 "

-PATCHES=( "${FILESDIR}/${P}-fix-no-flag-options-completion.patch" )
+DOCS=( KNOWN_BUGS README.mkd )

 src_compile() {
 	"${S}"/gen.sh > ${PN} || die
--- a/app-vim/csv/csv-0.31-r1.ebuild
+++ b/app-vim/csv/csv-0.31-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI=6

 inherit vim-plugin

--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@ -2,3 +2,4 @@ DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9
 DIST R-3.2.2.tar.gz 29772864 SHA256 9c9152e74134b68b0f3a1c7083764adc1cb56fd8336bec003fd0ca550cd2461d SHA512 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 WHIRLPOOL fea59929ada1d67dafc6ad89409d18ad173af7990384033f490a00e0f794d9919aecf7cd37089d105fe03b9cf64d079e5d148622571cec3eb924c1c5bd00081e
 DIST R-3.2.5.tar.gz 29876312 SHA256 60745672dce5ddc201806fa59f6d4e0ba6554d8ed78d0f9f0d79a629978f80b5 SHA512 aff7efa84188dfdd486d48095fadb9fbe1ab5897f9f924b9956d21d955d7cba9e50c1d21af6cca8327af8d1465b10761526a3a3be357c08a536831e7f5fc290b WHIRLPOOL 48b232bac4df9d562253fac3527c5786a6b45b3adeb5e91ad586549254ae1a2b53f0d39bc746cfd6d86094201f9d8e29617a9678780c7c58365f484f679fc7e0
 DIST R-3.3.0.tar.gz 29820067 SHA256 9256b154b1a5993d844bee7b1955cd49c99ad72cef03cce3cd1bdca1310311e4 SHA512 81e9ef761bee4d9322ca785fbed843ab13c2f5b55be769d982a81a7e7694e03980cbc7ee067fc850bd7a17ab65d93be81f27db50d428665773174c690383d4cc WHIRLPOOL bbc694374c778d0bb6e8e6ed6b5ef7b2e5c3dca19507ce58f3a544019f9b4aaf55ebbd4759ac0b880c571ca66826bfd8e88f71d164fd07be13c2797930daab07
+DIST R-3.3.1.tar.gz 29848329 SHA256 3dc59ae5831f5380f83c169bac2103ad052efe0ecec4ffa74bde4d85a0fda9e2 SHA512 d0ff85e99b9ec9cac672aa30d7d1a854778c6a610bcc5336e8c60c8c74f20856f2bfeae085af793fad646ff45cb4677d9d6dcbaa18212591f72f00a02339f4cd WHIRLPOOL 6e2edb60173a54c8b25d16201c24176b3ea837287e6d306c9d2e2c4578764b0d469d9c17228b6be67dda646a4272f30b331dbbc6238a6e851eb5320f04c7f151
--- a/dev-lang/R/R-3.3.1.ebuild
+++ b/dev-lang/R/R-3.3.1.ebuild
@ -0,0 +1,203 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
+
+BCP=${PN}-20130129.bash_completion
+DESCRIPTION="Language and environment for statistical computing and graphics"
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="
+	mirror://cran/src/base/R-3/${P}.tar.gz
+	https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
+REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
+
+CDEPEND="
+	app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	app-text/ghostscript-gpl
+	>=dev-libs/libpcre-8.35:3=
+	virtual/blas:0
+	|| ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
+	cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
+	icu? ( dev-libs/icu:= )
+	jpeg? ( virtual/jpeg:0 )
+	lapack? ( virtual/lapack:0 )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng:0= )
+	readline? ( sys-libs/readline:0= )
+	tiff? ( media-libs/tiff:0= )
+	tk? ( dev-lang/tk:0= )
+	X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
+	)"
+
+RDEPEND="${CDEPEND}
+	>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
+	java? ( >=virtual/jre-1.5 )"
+
+RESTRICT="minimal? ( test )"
+
+R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
+
+pkg_setup() {
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+	fortran-2_pkg_setup
+	filter-ldflags -Wl,-Bdirect -Bdirect
+	# avoid using existing R installation
+	unset R_HOME
+	# Temporary fix for bug #419761
+	if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
+		append-flags -fno-ipa-cp-clone
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
+		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
+		"${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
+
+	# fix packages.html for doc (gentoo bug #205103)
+	sed -i \
+		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/Rd.R || die
+
+	# fix Rscript path when installed (gentoo bug #221061)
+	sed -i \
+		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
+		src/unix/Makefile.in || die "sed unix Makefile failed"
+
+	# fix HTML links to manual (gentoo bug #273957)
+	sed -i \
+		-e 's:\.\./manual/:manual/:g' \
+		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
+
+	use lapack && \
+		export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+	if use X; then
+		export R_BROWSER="$(type -p xdg-open)"
+		export R_PDFVIEWER="$(type -p xdg-open)"
+	fi
+	use perl && \
+		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
+
+	# don't search /usr/local
+	sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
+	# Fix for Darwin (OS X)
+	if use prefix; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			sed -i \
+				-e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
+				-e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
+				-e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
+				-e "/SHLIB_EXT/s/\.so/.dylib/" \
+				configure.ac || die
+			# sort of "undo" 2.14.1-rmath-shared.patch
+			sed -i \
+				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+				src/nmath/standalone/Makefile.in || die
+		else
+			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+		fi
+	fi
+	AT_M4DIR=m4 eaclocal
+	eautoconf
+}
+
+src_configure() {
+	#	--with-system-tre \
+	# tre is patched from upstream
+	econf \
+		--enable-byte-compiled-packages \
+		--enable-R-shlib \
+		--disable-R-framework \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable java) \
+		$(use_enable nls) \
+		$(use_enable openmp) \
+		$(use_enable profile R-profiling) \
+		$(use_enable profile memory-profiling) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs R-static-lib) \
+		$(use_with cairo) \
+		$(use_with icu ICU) \
+		$(use_with jpeg jpeglib) \
+		$(use_with lapack) \
+		$(use_with !minimal recommended-packages) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with tiff libtiff) \
+		$(use_with tk tcltk) \
+		$(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
+		$(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
+		$(use_with X x)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake AR="$(tc-getAR)"
+	emake -C src/nmath/standalone \
+		shared $(use static-libs && echo static) AR="$(tc-getAR)"
+	use doc && emake info pdf
+}
+
+src_install() {
+	default
+	emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-info install-pdf
+		dosym ../manual /usr/share/doc/${PF}/html/manual
+	fi
+
+	cat > 99R <<-EOF
+		LDPATH=${R_DIR}/lib
+		R_HOME=${R_DIR}
+	EOF
+	doenvd 99R
+	newbashcomp "${WORKDIR}"/${BCP} ${PN}
+	# The buildsystem has a different understanding of install_names than
+	# we require.  Since it builds modules like shared objects (wrong), many
+	# objects (all modules) get an incorrect install_name.  Fixing the build
+	# system here is not really trivial.
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local mod
+		pushd "${ED}"/usr/lib/R > /dev/null
+		for mod in $(find . -name "*.dylib") ; do
+			mod=${mod#./}
+			install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
+				"${mod}"
+		done
+		popd > /dev/null
+	fi
+	docompress -x /usr/share/doc/${PF}/{BioC_mirrors.csv,CRAN_mirrors.csv,KEYWORDS.db,NEWS.rds}
+}
+
+pkg_postinst() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
--- a/dev-ruby/memoizable/memoizable-0.4.2.ebuild
+++ b/dev-ruby/memoizable/memoizable-0.4.2.ebuild
@ -1,9 +1,9 @@
-# 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_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"

 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
--- a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild
+++ b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

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

 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@ -1,2 +1 @@
-DIST subliminal-1.1.1-r1.tar.gz 4117531 SHA256 fd02eec1206ab1ef0ce83b0e051b3e029d90348f7a06461b9b6cdc681cea7de6 SHA512 b00bb34def5982041b6eec1acba84b0c297ea1b909dc0b9fe7c290c20f0b00e17e19a847987f549a07e5edfe0fee92913f00396cb8abe26c1f86927e027bccf1 WHIRLPOOL 0d95103c6cca1d50d05b3cf3ae113fadf0a294569cac9e55c549357d16f7c77ce408e3914e2a2b9e3a837659924bd1ff47db4f3459c42b4892b823d0fcf87cce
-DIST subliminal-2.0_rc1.tar.gz 4391496 SHA256 f5782e86834d35dc3658ed8002de380060c49a21b5445c5d3894c0ff46ae2450 SHA512 5955251baa0b527261d27eb358856a2353efe938440877877775f59814429609dd62c9b87df28e515e80866063657adc3c4d0d63e09ffe0c71e4502a4e490df8 WHIRLPOOL f1c90375394827a768302d06a181c763cdcb5178e770ae815efcbee34dcbc2500a07b77fc3421a05e3d15610f7cc7505011124201521bcbd5ee521750073cef2
+DIST subliminal-2.0.3.tar.gz 4428821 SHA256 12ad058d8bfdb0471d2021f8a486c2a11d2470e845bec1e71f698e4523ddc8fe SHA512 ed014ac25ab867cf1d7d16c1ecc19364a1b1281893c3e1aa1e678176d6df12623fc29f6a8159984cd2d621bf2f708655382ae7e0cf41c92956fc2d803f1b5c37 WHIRLPOOL 39a20b595660a78c3a48efa7affc973e4349f2912b5d077583d75d05e4bad8675b5d5594512e739398fff641fdc76a08afdc1deec6f54bba5b02b3f5014ea531
--- a/media-video/subliminal/subliminal-1.1.1-r1.ebuild
+++ b/media-video/subliminal/subliminal-1.1.1-r1.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to search and download subtitles"
-HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
-SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/guessit-0.9.1[${PYTHON_USEDEP}]
-	<dev-python/guessit-2[${PYTHON_USEDEP}]
-	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.2.0:4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	)
-"
-
-# Tests require network.
-RESTRICT=test
-
-python_prepare_all() {
-	# Disable code checkers as they require unavailable dependencies.
-	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
-	sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
--- a/media-video/subliminal/subliminal-2.0_rc1.ebuild
+++ b/media-video/subliminal/subliminal-2.0_rc1.ebuild
@ -5,14 +5,13 @@
 EAPI=6

 PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE='xml(+)'

 inherit distutils-r1

-MY_PV="${PV/_/-}"
-
 DESCRIPTION="Python library to search and download subtitles"
 HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal"
-SRC_URI="https://github.com/Diaoul/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
@ -23,35 +22,34 @@ RDEPEND="
 	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
 	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.2.0:4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
 	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
 	>=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
+	>=dev-python/pytz-2012c[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/python-futures[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 	)
 "

-# Tests require network and severely broken too.
+# Tests require network.
 RESTRICT=test

-S="${WORKDIR}/${PN}-${MY_PV}"
-
 python_prepare_all() {
 	# Disable code checkers as they require unavailable dependencies.
 	sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
--- a/media-video/subliminal/subliminal-9999.ebuild
+++ b/media-video/subliminal/subliminal-9999.ebuild
@ -5,6 +5,7 @@
 EAPI=6

 PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE='xml(+)'

 inherit distutils-r1 git-r3

@ -22,10 +23,10 @@ RDEPEND="
 	>=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
 	>=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-4.2.0:4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
 	>=dev-python/click-4.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
@ -39,15 +40,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-cov[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/sympy[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
 	)
 "

-# Tests require network and severely broken too.
+# Tests require network.
 RESTRICT=test

 python_prepare_all() {
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 23 Jun 2016 21:50:07 +0000
+Fri, 24 Jun 2016 05:40:46 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 23 Jun 2016 21:50:08 +0000
+Fri, 24 Jun 2016 05:40:46 +0000
--- a/metadata/md5-cache/app-admin/puppet-lint-0.3.2
+++ b/metadata/md5-cache/app-admin/puppet-lint-0.3.2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A linter for puppet DSL
-EAPI=4
-HOMEPAGE=http://puppet-lint.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/puppet-lint-0.3.2.gem
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=83832c75488297a518f0eb3d41a133a9
--- a/metadata/md5-cache/app-admin/puppet-lint-2.0.0
+++ b/metadata/md5-cache/app-admin/puppet-lint-2.0.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby20] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec-its:1[ruby_targets_ruby21] dev-ruby/rspec-collection_matchers:1[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A linter for puppet DSL
+EAPI=5
+HOMEPAGE=http://puppet-lint.com/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=mirror://rubygems/puppet-lint-2.0.0.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=273fd654509f972b453d6917d50ee7ba
--- a/metadata/md5-cache/app-admin/stow-2.2.0-r2
+++ b/metadata/md5-cache/app-admin/stow-2.2.0-r2
@ -1,4 +1,4 @@
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=install postinst
 DEPEND=dev-lang/perl test? ( virtual/perl-Test-Harness dev-perl/Test-Output )
 DESCRIPTION=Manage installation of software in /var/lib/
 EAPI=5
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
-SRC_URI=mirror://gnu/stow/stow-2.2.0.tar.gz
+SRC_URI=mirror://gnu/stow/stow-2.2.2.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=744c1973e2a523f88eb3fc579aa64af1
+_md5_=9bb9701563470cdcfe60c741e9bcb03c
--- a/metadata/md5-cache/app-editors/atom-1.8.0
+++ b/metadata/md5-cache/app-editors/atom-1.8.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=!dev-util/apm || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-text/hunspell-1.3.3:= =dev-libs/libgit2-0.23*:=[ssh] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-5.9.5:= >=dev-util/ctags-5.8 >=dev-util/electron-0.36.12-r3:0/36 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=A hackable text editor for the 21st Century
+EAPI=6
+HOMEPAGE=https://atom.io
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=!dev-util/apm || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-text/hunspell-1.3.3:= =dev-libs/libgit2-0.23*:=[ssh] >=gnome-base/libgnome-keyring-3.12:= >=dev-libs/oniguruma-5.9.5:= >=dev-util/ctags-5.8 >=dev-util/electron-0.36.12-r3:0/36
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/atom/atom/releases/download/v1.8.0/atom.x86_64.rpm -> atom-1.8.0.rpm https://github.com/elprans/asar/releases/download/v0.10.0-gentoo/asar-build.tar.gz -> asar-0.10.0.tar.gz https://github.com/nodejs/nan/archive/v2.0.9.tar.gz -> nodejs-nan-2.0.9.tar.gz https://github.com/atom/cached-run-in-this-context/archive/v0.4.1.tar.gz -> atom-cached-run-in-this-context-0.4.1.tar.gz https://github.com/atom/node-ctags/archive/v3.0.0.tar.gz -> atom-node-ctags-3.0.0.tar.gz https://github.com/atom/git-utils/archive/v4.1.2.tar.gz -> atom-git-utils-4.1.2.tar.gz https://github.com/nodegit/nodegit/archive/v0.12.2.tar.gz -> nodegit-0.12.2.tar.gz https://github.com/atom/keyboard-layout/archive/v1.0.0.tar.gz -> atom-keyboard-layout-1.0.0.tar.gz https://github.com/atom/marker-index/archive/v3.1.0.tar.gz -> atom-marker-index-3.1.0.tar.gz https://github.com/atom/node-keytar/archive/v3.0.2.tar.gz -> atom-node-keytar-3.0.2.tar.gz https://github.com/atom/node-nslog/archive/v3.0.0.tar.gz -> atom-node-nslog-3.0.0.tar.gz https://github.com/atom/node-oniguruma/archive/v5.1.2.tar.gz -> atom-node-oniguruma-5.1.2.tar.gz https://github.com/atom/node-pathwatcher/archive/v6.2.4.tar.gz -> atom-node-pathwatcher-6.2.4.tar.gz https://github.com/atom/node-runas/archive/v3.1.1.tar.gz -> atom-node-runas-3.1.1.tar.gz https://github.com/atom/scrollbar-style/archive/v3.2.0.tar.gz -> atom-scrollbar-style-3.2.0.tar.gz https://github.com/atom/node-spellchecker/archive/v3.2.3.tar.gz -> atom-node-spellchecker-3.2.3.tar.gz https://github.com/nodegit/promisify-node/archive/0.4.0.tar.gz -> nodegit-promisify-node-0.4.0.tar.gz https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz -> node-lodash-3.10.1.tgz https://github.com/kriskowal/asap/archive/v2.0.3.tar.gz -> node-asap-2.0.3.tar.gz https://github.com/sindresorhus/object-assign/archive/v4.0.1.tar.gz -> node-object-assign-4.0.1.tar.gz https://github.com/jprichardson/node-fs-extra/archive/0.26.2.tar.gz -> node-fs-extra-0.26.2.tar.gz https://github.com/jprichardson/node-jsonfile/archive/2.1.0.tar.gz -> node-jsonfile-2.1.0.tar.gz https://github.com/jprichardson/node-klaw/archive/1.0.0.tar.gz -> node-klaw-1.0.0.tar.gz https://github.com/isaacs/node-graceful-fs/archive/v4.1.2.tar.gz -> node-graceful-fs-4.1.2.tar.gz https://github.com/isaacs/rimraf/archive/v2.2.8.tar.gz -> node-rimraf-2.2.8.tar.gz https://github.com/tbranyen/combyne/archive/0.8.1.tar.gz -> node-combyne-0.8.1.tar.gz https://github.com/beautify-web/js-beautify/archive/v1.5.10.tar.gz -> node-js-beautify-1.5.10.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	rpm	3e120fdd74b358f9fb42b825a6558f61	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=f48b983be15cd4c3c80b375e47cedc53
--- a/metadata/md5-cache/app-emulation/vagrant-1.8.4
+++ b/metadata/md5-cache/app-emulation/vagrant-1.8.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/bundler-1.12.5[ruby_targets_ruby20] >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] >=dev-ruby/i18n-0.6.0:*[ruby_targets_ruby20] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby20] >=dev-ruby/listen-3.0.2[ruby_targets_ruby20] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby20] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby20] <dev-ruby/log4r-1.1.11[ruby_targets_ruby20] >=dev-ruby/net-ssh-3.0.1[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.0[ruby_targets_ruby20] >=dev-ruby/rest-client-1.6.0[ruby_targets_ruby20] <dev-ruby/rest-client-2.0[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.6.7.1[ruby_targets_ruby20] >=dev-ruby/mime-types-2.6.2:*[ruby_targets_ruby20] <dev-ruby/mime-types-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/bundler-1.12.5[ruby_targets_ruby21] >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/i18n-0.6.0:*[ruby_targets_ruby21] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby21] >=dev-ruby/listen-3.0.2[ruby_targets_ruby21] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby21] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby21] <dev-ruby/log4r-1.1.11[ruby_targets_ruby21] >=dev-ruby/net-ssh-3.0.1[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.0[ruby_targets_ruby21] >=dev-ruby/rest-client-1.6.0[ruby_targets_ruby21] <dev-ruby/rest-client-2.0[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.7.1[ruby_targets_ruby21] >=dev-ruby/mime-types-2.6.2:*[ruby_targets_ruby21] <dev-ruby/mime-types-3:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=A tool for building and distributing development environments
+EAPI=5
+HOMEPAGE=http://vagrantup.com/
+IUSE=+virtualbox test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) ruby_targets_ruby20? ( >=dev-ruby/bundler-1.12.5[ruby_targets_ruby20] >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby20] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby20] >=dev-ruby/i18n-0.6.0:*[ruby_targets_ruby20] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby20] >=dev-ruby/listen-3.0.2[ruby_targets_ruby20] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby20] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby20] <dev-ruby/log4r-1.1.11[ruby_targets_ruby20] >=dev-ruby/net-ssh-3.0.1[ruby_targets_ruby20] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby20] >=dev-ruby/net-scp-1.1.0[ruby_targets_ruby20] >=dev-ruby/rest-client-1.6.0[ruby_targets_ruby20] <dev-ruby/rest-client-2.0[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.6.7.1[ruby_targets_ruby20] >=dev-ruby/mime-types-2.6.2:*[ruby_targets_ruby20] <dev-ruby/mime-types-3:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/bundler-1.12.5[ruby_targets_ruby21] >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby21] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby21] >=dev-ruby/i18n-0.6.0:*[ruby_targets_ruby21] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby21] >=dev-ruby/listen-3.0.2[ruby_targets_ruby21] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby21] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby21] <dev-ruby/log4r-1.1.11[ruby_targets_ruby21] >=dev-ruby/net-ssh-3.0.1[ruby_targets_ruby21] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby21] >=dev-ruby/net-scp-1.1.0[ruby_targets_ruby21] >=dev-ruby/rest-client-1.6.0[ruby_targets_ruby21] <dev-ruby/rest-client-2.0[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.6.7.1[ruby_targets_ruby21] >=dev-ruby/mime-types-2.6.2:*[ruby_targets_ruby21] <dev-ruby/mime-types-3:*[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=0
+SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.8.4.tar.gz -> vagrant-1.8.4.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7faa2bb5ac12e2deba016c952e7f5c76
--- a/metadata/md5-cache/app-portage/metagen-0.6.5
+++ b/metadata/md5-cache/app-portage/metagen-0.6.5
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[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=metadata.xml generator for ebuilds
+EAPI=5
+HOMEPAGE=https://cgit.gentoo.org/proj/metagen.git
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/jaxml-3.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/portage-2.1.9.42[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=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.6.5.tar.bz2
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=341553d6077729b707251b19491453d3
--- a/metadata/md5-cache/app-shells/mpv-bash-completion-0.17
+++ b/metadata/md5-cache/app-shells/mpv-bash-completion-0.17
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=media-video/mpv[cli] !<app-shells/bash-4
+DEPEND=media-video/mpv[cli]
 DESCRIPTION=Bash completion for the mpv video player
 EAPI=6
 HOMEPAGE=https://2ion.github.io/mpv-bash-completion/
 KEYWORDS=~amd64
 LICENSE=GPL-3+
-RDEPEND=media-video/mpv[cli] !<app-shells/bash-4 >=app-shells/bash-completion-2.3-r1
+RDEPEND=media-video/mpv[cli] >=app-shells/bash-completion-2.3-r1
 SLOT=0
-SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/0.16.tar.gz -> mpv-bash-completion-0.16.tar.gz
+SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/0.17.tar.gz -> mpv-bash-completion-0.17.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=6a85c3deca01c5faf5d6d17b3c0ff061
+_md5_=5e183dcc0eb6240cbabc2522276b9e6d
--- a/metadata/md5-cache/app-vim/csv-0.31-r1
+++ b/metadata/md5-cache/app-vim/csv-0.31-r1
@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display and alter csv files
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2830
 KEYWORDS=amd64 x86
 LICENSE=vim
@ -9,4 +9,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
 _eclasses_=vim-doc	1b0813c9dadf2431c96854a8d46f5eaf	vim-plugin	1bbfc3364a7588372fb4c21734f0cd96
-_md5_=0dcfe3976ad7f707c64a66a8858847bb
+_md5_=8c2c15aa97af7386d660301240ce134b
--- a/metadata/md5-cache/dev-lang/R-3.3.1
+++ b/metadata/md5-cache/dev-lang/R-3.3.1
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
+DESCRIPTION=Language and environment for statistical computing and graphics
+EAPI=5
+HOMEPAGE=http://www.r-project.org/
+IUSE=cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils ) >=sys-libs/zlib-1.2.5.1-r2:0[minizip] java? ( >=virtual/jre-1.5 ) virtual/fortran
+REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
+RESTRICT=minimal? ( test )
+SLOT=0
+SRC_URI=mirror://cran/src/base/R-3/R-3.3.1.tar.gz https://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=051620617c2254d8eca2ff2ab9267fb5
--- a/metadata/md5-cache/dev-ruby/memoizable-0.4.2
+++ b/metadata/md5-cache/dev-ruby/memoizable-0.4.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.3.1: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? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[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=Memoize method return values
 EAPI=5
 HOMEPAGE=https://github.com/dkubb/memoizable
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/thread_safe-0.3.1:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/thread_safe-0.3.1: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? ( 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=0
 SRC_URI=mirror://rubygems/memoizable-0.4.2.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=97bc47ed579799d9706c739705ac2edf
+_md5_=f783924a3a26bc8b8cba4c1d2480791f
--- a/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
+++ b/metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/activemodel-3.0[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activemodel-3.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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
 EAPI=5
 HOMEPAGE=https://github.com/rspec/rspec-collection_matchers
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rspec-expectations-3.0.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rspec-expectations-3.0.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? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=1
 SRC_URI=mirror://rubygems/rspec-collection_matchers-1.1.2.gem
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=90a6f5516dfccce64af9df66b3a9e8cf
+_md5_=d717047e007b6eff72e6cbcb3be22343
--- a/metadata/md5-cache/media-video/subliminal-1.1.1-r1
+++ b/metadata/md5-cache/media-video/subliminal-1.1.1-r1
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/guessit-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/guessit-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/babelfish-0.5.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/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.2.0:4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[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/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( >=dev-python/vcrpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest-cov[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/pytest-runner[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/pytest[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/sympy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python library to search and download subtitles
-EAPI=6
-HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/guessit-0.9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] <dev-python/guessit-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/babelfish-0.5.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/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.2.0:4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[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/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Diaoul/subliminal/archive/1.1.1.tar.gz -> subliminal-1.1.1-r1.tar.gz
-_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7d1d3c7396ba844e81cd780623d188bc
--- a/metadata/md5-cache/media-video/subliminal-2.0.3
+++ b/metadata/md5-cache/media-video/subliminal-2.0.3
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/vcrpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python library to search and download subtitles
+EAPI=6
+HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal
+IUSE=test python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Diaoul/subliminal/archive/2.0.3.tar.gz -> subliminal-2.0.3.tar.gz
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=dea96949b44fc7f2941753f09b4d7c19
--- a/metadata/md5-cache/media-video/subliminal-2.0_rc1
+++ b/metadata/md5-cache/media-video/subliminal-2.0_rc1
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.2.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/vcrpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Python library to search and download subtitles
-EAPI=6
-HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal
-IUSE=test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.2.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Diaoul/subliminal/archive/2.0-rc1.tar.gz -> subliminal-2.0_rc1.tar.gz
-_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=74c0e4a80beaff7f34bc4a504c03e3f8
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.2.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/vcrpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( >=dev-python/vcrpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Python library to search and download subtitles
 EAPI=6
 HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal
 IUSE=test python_targets_python2_7 python_targets_python3_4
 LICENSE=MIT
-RDEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.2.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.5.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=bffdca0c4a680a5a6fac80392917599c
+_md5_=38cb2444a9a2c391bb0d025333094622
--- a/metadata/md5-cache/net-analyzer/lft-3.76
+++ b/metadata/md5-cache/net-analyzer/lft-3.76
@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=Layer Four Traceroute (LFT) and WhoB
+EAPI=5
+HOMEPAGE=http://pwhois.org/lft/
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=VOSTROM
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/lft-3.76.tar.gz
+_md5_=ffa75f25065ad1136b4b73320c9d9dc9
--- a/metadata/md5-cache/net-misc/i2pd-2.5.0-r4
+++ b/metadata/md5-cache/net-misc/i2pd-2.5.0-r4
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.46[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.46[static-libs,threads] dev-libs/crypto++[static-libs] !libressl? ( dev-libs/openssl:0[-bindist,static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=5
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( >=dev-libs/boost-1.46[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.5.0.tar.gz -> i2pd-2.5.0.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=24feb95ca10de54c6feb516c398c916a
--- a/metadata/md5-cache/net-misc/i2pd-2.5.1-r3
+++ b/metadata/md5-cache/net-misc/i2pd-2.5.1-r3
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.46[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.46[static-libs,threads] dev-libs/crypto++[static-libs] !libressl? ( dev-libs/openssl:0[-bindist,static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=6
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( >=dev-libs/boost-1.46[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.5.1.tar.gz -> i2pd-2.5.1.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8924e9b795528e5712a89c2a58525ca5
--- a/metadata/md5-cache/net-misc/i2pd-2.6.0-r1
+++ b/metadata/md5-cache/net-misc/i2pd-2.6.0-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.49[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.49[static-libs,threads] dev-libs/crypto++[static-libs] !libressl? ( dev-libs/openssl:0[-bindist,static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=6
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( >=dev-libs/boost-1.49[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.6.0.tar.gz -> i2pd-2.6.0.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=37701c399b0662c5a54ebd04f56704a4
--- a/metadata/md5-cache/net-misc/i2pd-2.6.0-r2
+++ b/metadata/md5-cache/net-misc/i2pd-2.6.0-r2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.49[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.49[static-libs,threads] dev-libs/crypto++[static-libs] !libressl? ( dev-libs/openssl:0[-bindist,static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
-EAPI=6
-HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=!static? ( >=dev-libs/boost-1.49[threads] dev-libs/crypto++ !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
-SLOT=0
-SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.6.0.tar.gz -> i2pd-2.6.0.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=be9c152841386f77d29c56973cdf6e0d
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.06.23.1
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.06.23.1
@ -9,6 +9,6 @@ LICENSE=public-domain
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2016.06.02/youtube-dl-2016.06.02.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2016.06.23.1/youtube-dl-2016.06.23.1.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
 _md5_=5610d622ba5f8d7a2a6f1671b8089ae8
--- a/metadata/md5-cache/www-apache/passenger-5.0.29
+++ b/metadata/md5-cache/www-apache/passenger-5.0.29
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rake[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rake[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rake[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* 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 )
+DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
+EAPI=5
+HOMEPAGE=https://www.phusionpassenger.com/
+IUSE=debug test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby20] >=dev-ruby/rake-0.8.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby21] >=dev-ruby/rake-0.8.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rake-0.8.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] www-servers/apache[apache2_modules_unixd(+)] =www-servers/apache-2* 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 )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=http://s3.amazonaws.com/phusion-passenger/releases/passenger-5.0.29.tar.gz
+_eclasses_=apache-module	5e66430013d92dfe0bf8672b05319b6d	depend.apache	e3c541cb90838388f81620d630c28f41	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=74c90505f29996307e2d5e1f988cb8fe
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Thu, 23 Jun 2016 21:50:08 +0000
+Fri, 24 Jun 2016 05:40:46 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Thu Jun 23 21:49:12 UTC 2016
+Fri Jun 24 05:39:51 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Thu, 23 Jun 2016 22:00:01 +0000
+Fri, 24 Jun 2016 06:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1466718601 Thu 23 Jun 2016 09:50:01 PM UTC
+1466746801 Fri 24 Jun 2016 05:40:01 AM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Thu, 23 Jun 2016 21:50:07 +0000
+Fri, 24 Jun 2016 05:40:46 +0000
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@ -1,2 +1,3 @@
 DIST lft-3.73.tar.gz 373097 SHA256 3ecd5371a827288a5f5a4abbd8a5ea8229e116fc2f548cee9afeb589bf206114 SHA512 ae0fac196aa4cee7a4f9832c1d4ee9e6bb012513b95e73f7818bd0d66c9347c8ee776532defdcd7425cc4866c95b37a93f8117c53cdbe22d229bbb4453dc552b WHIRLPOOL ab6d28d1b71239ef70ee313e09f1ed6112d3a711d7413981cf71d0cd828580e882b9e636a15eff80df1c3dcafbcdeec2fbba6af09273e3f1351e58052d024d56
 DIST lft-3.75.tar.gz 373133 SHA256 481aa24393d3ddd51e922992d04ae1a0a9ab01d303a4bbdc264c41ebc64dc935 SHA512 92f2e87c3c2f9f511bee77c39b7260b08c95171560c158bc4dcabe4017c54a5a708a96e24bbcd424c2cb9685ae1d981c13e746622b6c197a86199a8e54dfca25 WHIRLPOOL a51f6955234a4a648c4c447ef1125a2bf19dda96cc31d059a74ea23f941cdf4eb390c31b58bf99fafee7d58be640d422aa4380f5eae63b2cee9d5229952a0451
+DIST lft-3.76.tar.gz 375877 SHA256 fa163f8eaa9c27e12ecf533e79d8606895a301d2a75b9a77f0df29ef9a20c561 SHA512 b641a388293f6877b992089a9ab0cbe93f598aca6b181588e77823ba30f54692ebb8651f8aed5700ba84d2e083f0979885552e637f7928d1c7fb7b075c6630ff WHIRLPOOL dd963492d45ed59fb3eb5751026fd3e519ec26bfa37d14df4672c292ead328529445ea00c7d1e9dc9e58bd03f22f88ac7a10de7dea983967145a531de1de8731
--- a/net-analyzer/lft/lft-3.76.ebuild
+++ b/net-analyzer/lft/lft-3.76.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Layer Four Traceroute (LFT) and WhoB"
+HOMEPAGE="http://pwhois.org/lft/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="VOSTROM"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libpcap
+"
+RDEPEND="
+	${DEPEND}
+"
+
+DOCS=( CHANGELOG README TODO )
+
+src_prepare() {
+	sed -i Makefile.in -e 's:strip:true:g' || die
+}
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@ -1,5 +1,3 @@
-DIST i2pd-2.5.0.tar.gz 391637 SHA256 ea01cc99c443f838ab8faf3440da45dd2ca666ab627aa54b17c565c37782b01d SHA512 77be4f2b3baf86bcf0c8f4aebd7c5fbef80654d99ff332aafcf1cd717271d80fcfe717047ac47599cb0ecfdf32347cf1c0e0be2b79759f5194c1a7e7910a42ca WHIRLPOOL 929cb33849a51c5c214c64bef0e431c62738a6584fe63aa6ebcbd2febeb854135e5e16ed0f95c64bdfc241b15faaf45226347d3851a64421dd53e53932e03456
-DIST i2pd-2.5.1.tar.gz 394332 SHA256 4cdc98676eb1d020dc11c8f2c7c5d0e739bf8c858c97eab235449cea98ca9d2c SHA512 33293e96a2715696a8cb7bcabe995ffc9a5b374e4fa4b72eebf878a8b4603600a910ded1dc775d08d89eb881f0492118ef837a0432664f4a492008b31dafec92 WHIRLPOOL c9b02580d4e6af8430e7ca0d90ad45653df700b4e955f9fcd852301129801ded284b7583c8a9a1398457caa04c8ca5080655c6bbb94686ee56af9547752c753b
 DIST i2pd-2.6.0.tar.gz 669220 SHA256 3af3edfd5def3504cbda59aa737a47f9852f844a2f5a1b47659e138acdd614c4 SHA512 73761737a50283ed78e59263ff91bb21a41147d85de62f2e27742f4f90d8e2441c20ec329b78f88e2255d837ed4584564396caee04df44b5cf5d7c1110508aa5 WHIRLPOOL 94821e65d05eba9e61ee353cc2318f0182c69393cdcf34bb3af818c54720fff76259532855689355453eb917639dcfd4e5d1e8d894f857bfc853728c11b1c71e
 DIST i2pd-2.7.0.tar.gz 410922 SHA256 e4a3e192e424492962092f65a04fe12cac10f267ba2c99e2e62ca917741fba7e SHA512 3ca7af86ff43f030ab6219bd5ebe9a9acf4822d452c5761b83392ab0055f7835cfd68ebb336a2af0817bcdf9c8ecbefb618d00374384ded0084b51594aa96e0e WHIRLPOOL e1d05a5454cd9a0dbee18fea3447bc81fc74ee519e6ddb8f3d984ac66076f4606a624d55b9f22e2542f491626c18b74235247fe665ba789da2258f53b159ecfb
 DIST i2pd-2.8.0.tar.gz 1695271 SHA256 3f3f538b3c5b3095021311b434456c42d6f3b5e43dc7972c263b10ef179ba063 SHA512 379b72c4021dc8342405a034219ecb3681014a0ea1612da8b61de2b03adf2611ebe267233ed2891a2fb5a345d9304d7501c42d8c985362be72239b653d0d3c39 WHIRLPOOL 511d4e3a084604289c041a69135d8afc5abca186fe96704ca35108e96c84523706aaa73c07884dcce65df1fe9fed9335cea65b52dc14bd4a61b94d6fd11c6838
--- a/net-misc/i2pd/files/i2pd-2.5.0-fix_installed_components.patch
+++ b/net-misc/i2pd/files/i2pd-2.5.0-fix_installed_components.patch
@ -1,30 +0,0 @@
--- build/CMakeLists.txt.old	2016-02-04 21:30:50.954251000 +0100
-+++ build/CMakeLists.txt	2016-02-04 21:34:50.457793484 +0100
-@@ -356,10 +356,6 @@
-   endif ()
- endif ()
- 
-install(FILES ../LICENSE
-  DESTINATION .
-  COMPONENT Runtime
-  )
- # Take a copy on Appveyor
- install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
-   DESTINATION .
-@@ -369,7 +365,6 @@
-   )
- 
- file(GLOB_RECURSE I2PD_SOURCES "../*.cpp" "../build" "../Win32" "../Makefile*")
-install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
- # install(DIRECTORY ../ DESTINATION src/
- #   # OPTIONAL
- #   COMPONENT Source FILES_MATCHING
-@@ -378,7 +373,7 @@
- #   )
- 
- file(GLOB I2PD_HEADERS "../*.h")
-install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
-+install(FILES ${I2PD_HEADERS} DESTINATION "include/${PROJECT_NAME}" COMPONENT Headers)
- # install(DIRECTORY ../ DESTINATION src/
- #   # OPTIONAL
- #   COMPONENT Headers FILES_MATCHING
--- a/net-misc/i2pd/files/i2pd-2.5.0.confd
+++ b/net-misc/i2pd/files/i2pd-2.5.0.confd
@ -1,9 +0,0 @@
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-I2PD_LOG="/var/log/i2pd.log"
-I2PD_PID="/var/run/i2pd.pid"
-I2PD_CFGDIR="/etc/i2pd/"
-# Options to i2pd
-I2PDOPTIONS="--daemon --service --pidfile ${I2PD_PID} \
--log=file --logfile=${I2PD_LOG} \
--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg"
--- a/net-misc/i2pd/files/i2pd-2.5.0.initd
+++ b/net-misc/i2pd/files/i2pd-2.5.0.initd
@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="C++ daemon for accessing the I2P network"
-
-depend() {
-	use dns logger netmount
-}
-
-start() {
-        ebegin "Starting ${SVCNAME}"
-        checkpath -f "${I2PD_LOG}" -o "${I2PD_USER}:${I2PD_GROUP}"
-        checkpath -f "${I2PD_PID}" -o "${I2PD_USER}:${I2PD_GROUP}"
-        start-stop-daemon -S -b -u "${I2PD_USER}:${I2PD_GROUP}" /usr/bin/i2pd -- ${I2PDOPTIONS}
-        sleep 1
-        [ -e "$I2PD_PID" -a -e /proc/$(cat "$I2PD_PID") ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping ${SVCNAME}"
-        start-stop-daemon -K -p "${I2PD_PID}" -R SIGTERM/20 SIGKILL/20 -P
-        eend $?
-}
--- a/net-misc/i2pd/files/i2pd-2.5.0.logrotate
+++ b/net-misc/i2pd/files/i2pd-2.5.0.logrotate
@ -1,11 +0,0 @@
-/var/log/i2pd.log {
-        rotate 4
-        weekly
-        missingok
-        notifempty
-        create 640 i2pd i2pd
-        postrotate
-                /bin/kill -HUP $(cat /var/run/i2pd.pid)
-        endscript
-}
-
--- a/net-misc/i2pd/files/i2pd-2.5.0.service
+++ b/net-misc/i2pd/files/i2pd-2.5.0.service
@ -1,18 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/var/run/i2pd.pid
-User=i2pd
-Group=i2pd
-PermissionsStartOnly=yes
-ExecStartPre=/bin/touch /var/run/i2pd.pid /var/log/i2pd.log
-ExecStartPre=/bin/chown i2pd:i2pd /var/run/i2pd.pid /var/log/i2pd.log
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile /var/run/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
-
-[Install]
-WantedBy=multi-user.target
-
--- a/net-misc/i2pd/files/i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch
+++ b/net-misc/i2pd/files/i2pd-2.5.1-disable_ipv6_in_i2pd_conf.patch
@ -1,9 +0,0 @@
-diff -Naur i2pd-2.5.1/debian/i2pd.conf i2pd-2.5.1b/debian/i2pd.conf
--- i2pd-2.5.1/debian/i2pd.conf	2016-03-10 19:34:16.000000000 +0100
-+++ i2pd-2.5.1b/debian/i2pd.conf	2016-03-24 22:30:51.490011172 +0100
-@@ -1,4 +1,4 @@
-ipv6
-+#ipv6
- 
- [httpproxy]
- address = 127.0.0.1
--- a/net-misc/i2pd/files/i2pd-2.5.1.confd
+++ b/net-misc/i2pd/files/i2pd-2.5.1.confd
@ -1,9 +0,0 @@
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-I2PD_LOG="/var/log/i2pd.log"
-I2PD_PID="/var/run/i2pd.pid"
-I2PD_CFGDIR="/etc/i2pd/"
-# Options to i2pd
-I2PDOPTIONS="--daemon --service --pidfile=${I2PD_PID} \
--log=file --logfile=${I2PD_LOG} \
--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.cfg"
--- a/net-misc/i2pd/files/i2pd-2.5.1.initd
+++ b/net-misc/i2pd/files/i2pd-2.5.1.initd
@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="C++ daemon for accessing the I2P network"
-
-depend() {
-	use dns logger netmount
-}
-
-start() {
-        ebegin "Starting ${SVCNAME}"
-        checkpath -f "${I2PD_LOG}" -o "${I2PD_USER}:${I2PD_GROUP}"
-        checkpath -f "${I2PD_PID}" -o "${I2PD_USER}:${I2PD_GROUP}"
-        start-stop-daemon -S -u "${I2PD_USER}:${I2PD_GROUP}" -p "${I2PD_PID}.pid" /usr/bin/i2pd -- ${I2PDOPTIONS}
-        sleep 1
-        [ -e "$I2PD_PID" -a -e /proc/$(cat "$I2PD_PID") ]
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping ${SVCNAME}"
-        start-stop-daemon -K -p "${I2PD_PID}" -R SIGTERM/20 SIGKILL/20 -P
-        eend $?
-}
--- a/net-misc/i2pd/files/i2pd-2.5.1.service
+++ b/net-misc/i2pd/files/i2pd-2.5.1.service
@ -1,18 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/var/run/i2pd.pid
-User=i2pd
-Group=i2pd
-PermissionsStartOnly=yes
-ExecStartPre=/bin/touch /var/run/i2pd.pid /var/log/i2pd.log
-ExecStartPre=/bin/chown i2pd:i2pd /var/run/i2pd.pid /var/log/i2pd.log
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/var/run/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.cfg
-
-[Install]
-WantedBy=multi-user.target
-
--- a/net-misc/i2pd/files/i2pd-2.6.0-r2.confd
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r2.confd
@ -1,9 +0,0 @@
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-I2PD_LOG="/var/log/i2pd.log"
-I2PD_PID="/run/i2pd/i2pd.pid"
-
-# Options to i2pd
-I2PD_OPTIONS="--daemon --service --pidfile=${I2PD_PID} \
--log=file --logfile=${I2PD_LOG} \
--conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf"
--- a/net-misc/i2pd/files/i2pd-2.6.0-r2.initd
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r2.initd
@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-description="C++ daemon for accessing the I2P network"
-description_graceful="Graceful shutdown, takes 10 minutes"
-
-command="/usr/bin/i2pd"
-command_args="${I2PD_OPTIONS}"
-user="${I2PD_USER}:${I2PD_GROUP}"
-start_stop_daemon_args="
-    --user \"${user}\"
-    --pidfile \"${I2PD_PID}\"
-    --progress --retry 'SIGTERM/20 SIGKILL/20'
-"
-I2PD_PID_DIR=$(dirname "${I2PD_PID}")
-
-extra_started_commands="graceful"
-
-depend() {
-    use dns logger netmount
-}
-
-start_pre() {
-    if [ -z "${I2PD_USER}" ] || \
-       [ -z "${I2PD_GROUP}" ] || \
-       [ -z "${I2PD_PID}" ] || \
-       [ -z "${I2PD_LOG}" ] || \
-       [ -z "${I2PD_OPTIONS}" ] ; then
-        eerror "Not all variables I2PD_USER, I2PD_GROUP, I2PD_PID, I2PD_OPTIONS, I2PD_LOG are defined."
-        eerror "Check your /etc/conf.d/i2pd."
-        return 1
-    fi
-    checkpath -f -o "${user}" "${I2PD_LOG}"
-    checkpath -d -m 0750 -o "${user}" "${I2PD_PID_DIR}"
-}
-
-graceful() {
-    # on SIGINT, i2pd stops accepting tunnels and shuts down in 600 seconds
-    ebegin "Gracefully stopping i2pd, this takes 10 minutes"
-    mark_service_stopping
-    eval start-stop-daemon --stop ${start_stop_daemon_args} \
-        --exec "${command}" --retry 'SIGINT/620 SIGTERM/20 SIGKILL/20'
-    eend $? && mark_service_stopped
-}
--- a/net-misc/i2pd/files/i2pd-2.6.0-r2.service
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r2.service
@ -1,20 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/run/i2pd/i2pd.pid
-User=i2pd
-Group=i2pd
-PermissionsStartOnly=yes
-ExecStartPre=/bin/mkdir -p /run/i2pd
-ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd
-ExecStartPre=/bin/touch /run/i2pd/i2pd.pid /var/log/i2pd.log
-ExecStartPre=/bin/chown i2pd:i2pd /run/i2pd/i2pd.pid /var/log/i2pd.log
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/run/i2pd/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
-
-[Install]
-WantedBy=multi-user.target
-
--- a/net-misc/i2pd/files/i2pd-2.6.0.confd
+++ b/net-misc/i2pd/files/i2pd-2.6.0.confd
@ -1,9 +0,0 @@
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-I2PD_LOG="/var/log/i2pd.log"
-I2PD_PID="/var/run/i2pd.pid"
-I2PD_CFGDIR="/etc/i2pd/"
-# Options to i2pd
-I2PDOPTIONS="--daemon --service --pidfile=${I2PD_PID} \
--log=file --logfile=${I2PD_LOG} \
--conf=${I2PD_CFGDIR}i2pd.conf --tunconf=${I2PD_CFGDIR}tunnels.conf"
--- a/net-misc/i2pd/files/i2pd-2.6.0.service
+++ b/net-misc/i2pd/files/i2pd-2.6.0.service
@ -1,18 +0,0 @@
-[Unit]
-Description=C++ daemon for accessing the I2P network
-After=network.target
-
-[Service]
-Type=forking
-Restart=on-abnormal
-PIDFile=/var/run/i2pd.pid
-User=i2pd
-Group=i2pd
-PermissionsStartOnly=yes
-ExecStartPre=/bin/touch /var/run/i2pd.pid /var/log/i2pd.log
-ExecStartPre=/bin/chown i2pd:i2pd /var/run/i2pd.pid /var/log/i2pd.log
-ExecStart=/usr/bin/i2pd --daemon --service --pidfile=/var/run/i2pd.pid --log=file --logfile=/var/log/i2pd.log --conf=/etc/i2pd/i2pd.conf --tunconf=/etc/i2pd/tunnels.conf
-
-[Install]
-WantedBy=multi-user.target
-
--- a/net-misc/i2pd/files/i2pd.1
+++ b/net-misc/i2pd/files/i2pd.1
@ -1,101 +0,0 @@
-.TH I2PD "1" "November 29, 2014"
-
-.SH NAME
-i2pd \- Load-balanced unspoofable packet switching network
-
-.SH SYNOPSIS
-.B i2pd
-[\fIOPTION1\fR) [\fIOPTION2\fR]...
-
-.SH DESCRIPTION
-i2pd
-is a C++ implementation of the router for the I2P anonymizing network, offering
-a simple layer that identity-sensitive applications can use to securely
-communicate. All data is wrapped with several layers of encryption, and the
-network is both distributed and dynamic, with no trusted parties.
-
-.PP
-Any of the configuration options below can be used in the \fI2PDOPTIONS\fR variable in \fI/etc/conf.d/i2pd\fR.
-.BR
-.TP
-\fB\-\-host=\fR
-The external IP
-.TP
-\fB\-\-port=\fR
-The external port to listen on
-.TP
-\fB\-\-httpport=\fR
-The HTTP port to listen on
-.TP
-\fB\-\-log=\fR[\fI1\fR|\fI0\fR]
-.br
-Enable of disable logging to a file. \fI1\fR for yes, \fI0\fR for no. (default: \fI0\fR, off)
-.TP
-\fB\-\-daemon=\fR[\fI1\fR|\fI0\fR]
-Enable or disable daemon mode. Daemon mode is enabled with \fI1\fR  and disabled with \fI0\fR. (default: \fI0\fR, off)
-.TP
-\fB\-\-service=\fR[\fI1\fR|\fI0\fR]
-If enabled, system folders (\fB/var/run/i2pd.pid\fR, \fB/var/log/i2pd.log\fR, \fB/var/lib/i2pd\fR) will be used. If off, \fB$HOME/.i2pd\fR will be used instead. (default: \fI0\fR, off).
-.TP
-\fB\-\-unreachable=\fR[\fI1\fR|\fI0\fR]
-\fI1\fR if router is declared as unreachable and works through introducers. (default: \fI0\fR, off)
-.TP
-\fB\-\-v6=\fR[\fI1\fR|\fI0\fR]
-\fI1\fR if \fBi2pd\fR should communicate via IPv6. (default: \fI0\fR, off)
-.TP
-\fB\-\-httpproxyport=\fR
-The local port for the HTTP Proxy to listen on (default: \fI4446\fR)
-.TP
-\fB\-\-socksproxyport=\fR
-The local port for the SOCKS proxy to listen on (default: \fI4447\fR)
-.TP
-\fB\-\-ircport=\fR
-The local port of IRC tunnel to listen on. (default: \fI6668\fR)
-.TP
-\fB\-\-ircdest=\fR
-I2P destination address of an IRC server to connect to, e.g. \fIirc.postman.i2p\fR
-.TP
-\fB\-\-irckeys=\fR
-optional keys file for local destination
-.TP
-\fB\-\-eepkeys=\fR
-File name containing destination keys. For example \fIprivKeys.dat\fR
-.TP
-\fB\-\-eephost=\fR
-Address incoming trafic is forwarded to, \fI127.0.0.1\fR by default
-.TP
-\fB\-\-eepport=\fR
-Port incoming trafic forward to. \fI80\fR by default
-.TP
-\fB\-\-samport=\fR
-Port of SAM bridge. Usually \fI7656\fR. SAM will not be enabled if this is not set. (default: unset)
-.TP
-\fB\-\-bobport=\fR
-Port of BOB command channel. Usually \fI2827\fR. BOB will not be enabled if this is not set. (default: unset)
-
-.SH FILES
-.PP
-/etc/conf.d/i2pd
-.RS 4
-i2pd service configuration file
-.RE
-.PP
-/etc/i2pd.conf
-.RS 4
-i2pd configuration file (when running as a system service). You may override the parameters here.
-.RE
-.PP
-/var/lib/i2pd/
-.RS 4
-i2pd profile directory (when running as a system service, see \fB\-\-service=\fR above)
-.RE
-.PP
-$HOME/.i2pd
-.RS 4
-i2pd profile directory (when running as a normal user)
-.SH AUTHOR
-This manual page was written by kytv <killyourtv@i2pmail.org> for the Debian system (but may be used by others). And adapted by Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org> to Gentoo.
-.BR
-Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation
-.BR
-On Gentoo systems, the complete text of the GNU General Public License Version 2 can be found in /usr/portage/licenses/GPL-2
--- a/net-misc/i2pd/files/tunnels.cfg
+++ b/net-misc/i2pd/files/tunnels.cfg
@ -1,17 +0,0 @@
-# outgoing tunnel sample, to remote service
-# mandatory parameters:
-# * type -- always "client"
-# * port -- local port to listen to
-# * destination -- i2p hostname
-# optional parameters (may be omitted)
-# * keys -- our identity, if unset, will be generated on every startup,
-#     if set and file missing, keys will be generated and placed to this file
-# * address -- local interface to bind
-# * signaturetype -- signature type for new destination. 0,1 or 7
-[IRC]
-type = client
-address = 127.0.0.1
-port = 6668
-destination = irc.postman.i2p
-keys = irc-keys.dat
-signaturetype = 1
--- a/net-misc/i2pd/i2pd-2.5.0-r4.ebuild
+++ b/net-misc/i2pd/i2pd-2.5.0-r4.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
-			dev-libs/crypto++
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.46[static-libs,threads]
-		dev-libs/crypto++[static-libs]
-		!libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
-		upnp? ( net-libs/miniupnpc[static-libs] ) )
-	i2p-hardening? ( >=sys-devel/gcc-4.7 )
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
-	epatch "${FILESDIR}/i2pd-2.5.0-fix_installed_components.patch"
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	doman "${FILESDIR}/${PN}.1"
-	keepdir /var/lib/i2pd/
-	insinto "/var/lib/i2pd"
-	doins -r "${S}/contrib/certificates"
-	dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	doins "${S}/debian/${PN}.conf"
-	doins "${FILESDIR}/tunnels.cfg"
-	doins "${S}/debian/subscriptions.txt"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
-	fperms 600 "/etc/${PN}/${PN}.conf"
-	dodir /usr/share/i2pd
-	newconfd "${FILESDIR}/${PN}-2.5.0.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-2.5.0.initd" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}-2.5.0.service" "${PN}.service"
-	doenvd "${FILESDIR}/99${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
--- a/net-misc/i2pd/i2pd-2.5.1-r3.ebuild
+++ b/net-misc/i2pd/i2pd-2.5.1-r3.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
-			dev-libs/crypto++
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.46[static-libs,threads]
-		dev-libs/crypto++[static-libs]
-		!libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
-		upnp? ( net-libs/miniupnpc[static-libs] ) )
-	i2p-hardening? ( >=sys-devel/gcc-4.7 )
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-fix_installed_components.patch"
-	eapply "${FILESDIR}/${P}-disable_ipv6_in_i2pd_conf.patch"
-	eapply_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	doman "${FILESDIR}/${PN}.1"
-	keepdir /var/lib/i2pd/
-	insinto "/var/lib/i2pd"
-	doins -r "${S}/contrib/certificates"
-	dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	doins "${S}/debian/${PN}.conf"
-	doins "${S}/debian/subscriptions.txt"
-	doins "${FILESDIR}/tunnels.cfg"
-	dodir /usr/share/i2pd
-	newconfd "${FILESDIR}/${PN}-2.5.1.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-2.5.1.initd" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}-2.5.1.service" "${PN}.service"
-	doenvd "${FILESDIR}/99${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf" \
-		"/etc/${PN}/subscriptions.txt" \
-		"/etc/${PN}/tunnels.cfg"
-	fperms 600 "/etc/${PN}/${PN}.conf" \
-		"/etc/${PN}/subscriptions.txt" \
-		"/etc/${PN}/tunnels.cfg"
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
--- a/net-misc/i2pd/i2pd-2.6.0-r1.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r1.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
-			dev-libs/crypto++
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
-		dev-libs/crypto++[static-libs]
-		!libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
-		upnp? ( net-libs/miniupnpc[static-libs] ) )
-	i2p-hardening? ( >=sys-devel/gcc-4.7 )
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch"
-	eapply_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	keepdir /var/lib/i2pd/
-	insinto "/var/lib/i2pd"
-	doins -r "${S}/contrib/certificates"
-	dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	doins "${S}/docs/${PN}.conf"
-	doins "${S}/debian/subscriptions.txt"
-	doins "${S}/debian/tunnels.conf"
-	dodir /usr/share/i2pd
-	newconfd "${FILESDIR}/${PN}-2.6.0.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-2.5.1.initd" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}-2.6.0.service" "${PN}.service"
-	doenvd "${FILESDIR}/99${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf" \
-		"/etc/${PN}/subscriptions.txt" \
-		"/etc/${PN}/tunnels.conf"
-	fperms 600 "/etc/${PN}/${PN}.conf" \
-		"/etc/${PN}/subscriptions.txt" \
-		"/etc/${PN}/tunnels.conf"
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
--- a/net-misc/i2pd/i2pd-2.6.0-r2.ebuild
+++ b/net-misc/i2pd/i2pd-2.6.0-r2.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils systemd user cmake-utils
-
-DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
-HOMEPAGE="https://github.com/PurpleI2P/i2pd"
-SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
-
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
-			dev-libs/crypto++
-			!libressl? ( dev-libs/openssl:0 )
-			libressl? ( dev-libs/libressl )
-			upnp? ( net-libs/miniupnpc )
-		)"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
-		dev-libs/crypto++[static-libs]
-		!libressl? ( dev-libs/openssl:0[-bindist,static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
-		upnp? ( net-libs/miniupnpc[static-libs] ) )
-	i2p-hardening? ( >=sys-devel/gcc-4.7 )
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
-
-I2PD_USER="${I2PD_USER:-i2pd}"
-I2PD_GROUP="${I2PD_GROUP:-i2pd}"
-
-CMAKE_USE_DIR="${S}/build"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch"
-	eapply_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
-		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
-		-DWITH_STATIC=$(usex static ON OFF)
-		-DWITH_UPNP=$(usex upnp ON OFF)
-		-DWITH_LIBRARY=ON
-		-DWITH_BINARY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README.md
-	keepdir /var/lib/i2pd/
-	insinto "/var/lib/i2pd"
-	doins -r "${S}/contrib/certificates"
-	dosym /etc/i2pd/subscriptions.txt /var/lib/i2pd/subscriptions.txt
-	fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
-	fperms 700 /var/lib/i2pd/
-	dodir "/etc/${PN}"
-	insinto "/etc/${PN}"
-	doins "${S}/docs/${PN}.conf"
-	doins "${S}/debian/subscriptions.txt"
-	doins "${S}/debian/tunnels.conf"
-	dodir /usr/share/i2pd
-	newconfd "${FILESDIR}/${PN}-2.6.0-r2.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-2.6.0-r2.initd" "${PN}"
-	systemd_newunit "${FILESDIR}/${PN}-2.6.0-r2.service" "${PN}.service"
-	doenvd "${FILESDIR}/99${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.5.0.logrotate" "${PN}"
-	fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf" \
-		"/etc/${PN}/subscriptions.txt" \
-		"/etc/${PN}/tunnels.conf"
-	fperms 600 "/etc/${PN}/${PN}.conf" \
-		"/etc/${PN}/subscriptions.txt" \
-		"/etc/${PN}/tunnels.conf"
-}
-
-pkg_setup() {
-	enewgroup "${I2PD_GROUP}"
-	enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
-}
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@ -1,3 +1,3 @@
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
-DIST youtube-dl-2016.06.02.tar.gz 2152368 SHA256 0a2ce75ec7734b2b251815146f52678240e9f8cedeb00a5da04c85ebae8e1497 SHA512 36a75ca134c8dc70cfca763af552aadc9e4a6a997c62893a770652980c68918244c7f447db4dcc10147704a25c73f3d0a36de436bb881883c5c915f96f1c54b6 WHIRLPOOL ab4a29c741a0abd8b4ca6f359372ef1303467fc5c5a2ec56c6bbf14eb03448b098a42a65fd8271057f2f55c9f7d1bbd67238550ce4ac875993eca5a5a284865e
 DIST youtube-dl-2016.06.03.tar.gz 2155490 SHA256 29d9eb4eeea9c781010ee6111a8d0dc6469b9974fbd76c6c6d1641f3e8d489e2 SHA512 bd810f636c0a840ffd09cf1fe87001c64b4dc749b1a52a6807412bee36646862bbea6204457b4cb27425d2386d3f96a9b00eef674170cb013d12859944e256d7 WHIRLPOOL 6cf36e1f4f6d97613f59f204a94876f09c816d82b306a413833e183ac1c95d5fbd92f1bde70dbc063bd39e753ab43527b41e1a8d04dac7bca58ef1ec9a23ef2e
+DIST youtube-dl-2016.06.23.1.tar.gz 2214493 SHA256 fd4e2304eb71c934502929446596b898ca7197b26dabb3540795bcfcc16a2e13 SHA512 342ef1304050547cbce5f057ae980b71c016a13fba06e6f9a42a2dcf29a493b3d398527a1a482013df5c7aad41e2e76981a707133214b7e3fc002dbb82e4e262 WHIRLPOOL 8b6c0e993a944e4b6ba73128bcd6ccd5d020feb8a9d7d2598be892c72a4b1dda1ae8135e7c8840e0e33a523e7987b7fa74beaea20a8f318db5d10769a8cf25ec
--- a/net-misc/youtube-dl/youtube-dl-2016.06.23.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.06.23.1.ebuild
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@ -1,2 +1,3 @@
 DIST passenger-4.0.60.tar.gz 5271049 SHA256 bbb8c18cc371441ce4ee9a4de4d124b6ec5e6af6e95a472b93a72d0357dc88fe SHA512 144df1e5e3dfbf9f9fa13d959c0324760b01c5e86b3f8e52c3d7d9c32eec916a35cc5c52a8c7a5ab9ed1ccee4d7efc9f77fc9940ad1515937a7bfe964753b219 WHIRLPOOL c8f3993b2745eb577c2eddbca2fd280e7db56adbeb4f72ba4b29770d95b991a8012243d1a9bd19aa59a28cfb9326117d649f70cf6d406a4e53acd1e40deb5b57
 DIST passenger-5.0.28.tar.gz 5576921 SHA256 a5adb8c5446045f56a7c13bc75c5f3e96b7cfb01a10462107032929167dc17fa SHA512 1556e612d3c99c18b5cd67945c85b58d82676d2e0c2cd0a5ec235b9e378bf392b931f7ff892baeb44778dd1f8d4f0801a75c9bfb8da0c6daaad9ef8804499081 WHIRLPOOL 7827cbdb87de508e879e24240ce6695a54d90afb42ed80ad4f71093b406e1c1dd8d18cf12cc70cdf9f35bc9e2eb206d75c7f3690c33d8139f9ffdc6a475fd35d
+DIST passenger-5.0.29.tar.gz 5587142 SHA256 84dd9553f305b6b87227c87a086068b42f2ba979e7af3f8acd745c99c40f10cc SHA512 3fc55db3b0b346687822d0a58f5642e9df72469493d0f447b6de2e112b3556f3f056b6aabd94f215386f366898607786b6c7ab5ba396968730ae72ca9d4eeff1 WHIRLPOOL acaec8db6faf4dec9673130496e6d6effef2449fc7aeac05da00226c26c22065d246e816d5363fce69650b6f39536f8563d813c8599fc8861c36266806eec884
--- a/www-apache/passenger/passenger-5.0.29.ebuild
+++ b/www-apache/passenger/passenger-5.0.29.ebuild
@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Passenger makes deployment of Ruby on Rails applications a breeze"
+HOMEPAGE="https://www.phusionpassenger.com/"
+SRC_URI="http://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.0.0:*
+	>=dev-ruby/rake-0.8.1"
+
+# libev is bundled but with adapations that do not seem to be accepted
+# upstream, so we must use the bundled version :-(
+CDEPEND="
+	>=dev-libs/libuv-1.8.0
+	net-misc/curl[ssl]
+	www-servers/apache[apache2_modules_unixd(+)]"
+
+RDEPEND="${RDEPEND} ${CDEPEND}"
+DEPEND="${DEPEND} ${CDEPEND}"
+
+APACHE2_MOD_CONF="30_mod_${PN}-5.0.0 30_mod_${PN}"
+APACHE2_MOD_DEFINE="PASSENGER"
+
+need_apache2
+
+pkg_setup() {
+	use debug && append-flags -DPASSENGER_DEBUG
+}
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.20-gentoo.patch
+
+	# Change these with sed instead of a patch so that we can easily use
+	# the toolchain-funcs methods.
+	sed -i -e "/^CC/ s/=.*$/= '$(tc-getCC)'/" \
+		-e "/^CXX\s/ s/=.*$/= '$(tc-getCXX)'/" \
+		-e 's/PlatformInfo.debugging_cflags//' build/basics.rb || die
+
+	# Avoid fixed debugging CFLAGs.
+	sed -e '/debugging_cflags/areturn ""' -i src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb || die
+
+	# Use sed here so that we can dynamically set the documentation directory.
+	sed -i -e "s:/usr/share/doc/passenger:/usr/share/doc/${P}:" \
+		-e "s:/usr/lib/apache2/modules/mod_passenger.so:${APACHE_MODULESDIR}/mod_passenger.so:" \
+		-e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" \
+		src/ruby_supportlib/phusion_passenger.rb || die
+	sed -i -e "s:/usr/lib/phusion-passenger/agents:/usr/libexec/phusion-passenger/agents:" src/cxx_supportlib/ResourceLocator.h || die
+
+	# Don't install a tool that won't work in our setup.
+	sed -i -e '/passenger-install-apache2-module/d' src/ruby_supportlib/phusion_passenger/packaging.rb || die
+	rm -f bin/passenger-install-apache2-module || die "Unable to remove unneeded install script."
+
+	# Make sure we use the system-provided version where possible
+	rm -rf src/cxx_supportlib/vendor-copy/libuv || die "Unable to remove vendored code."
+
+	# Avoid building documentation to avoid a dependency on mizuho.
+	#sed -i -e 's/, :doc//' build/packaging.rb || die
+	touch doc/*.html || die
+
+	# Fix hard-coded use of AR
+	sed -i -e "s/ar cru/"$(tc-getAR)" cru/" build/support/cplusplus.rb || die
+}
+
+all_ruby_compile() {
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	ruby -S rake apache2 || die "rake failed"
+}
+
+each_ruby_compile() {
+	append-flags -fno-strict-aliasing
+
+	V=1 EXTRA_LDFLAGS="${LDFLAGS}" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake native_support || die "rake failed"
+}
+
+all_ruby_install() {
+	APACHE2_MOD_FILE="${S}/buildout/apache2/mod_${PN}.so"
+	apache-module_src_install
+
+	# Patch in the correct libdir
+	sed -i -e 's:/usr/lib/:/usr/'$(get_libdir)'/:' "${D}${APACHE_MODULES_CONFDIR}/30_mod_${PN}.conf" || die
+
+	dodoc CHANGELOG README.md
+}
+
+each_ruby_install() {
+	DISTDIR="${D}" \
+	RUBYLIBDIR="$(ruby_rbconfig_value vendordir)" \
+	RUBYARCHDIR="$(ruby_rbconfig_value archdir)" \
+	APXS2="${APXS}" \
+	HTTPD="${APACHE_BIN}" \
+	FS_LIBDIR='/usr/'$(get_libdir) \
+	EXTRA_LDFLAGS="${LDFLAGS}" \
+	USE_VENDORED_LIBUV="no" LIBUV_LIBS="-luv" \
+	${RUBY} -S rake fakeroot || die "rake failed"
+}