Sync with portage [Mon Apr 24 23:46:19 MSK 2017].

app-backup/bacula/Manifest

@@ -2,3 +2,4 @@ DIST bacula-5.2.13.tar.gz 4243395 SHA256 a4bed458bf001889bd06bf31671b5d9908055a1
 DIST bacula-7.0.5.tar.gz 3216406 SHA256 1457849eb33011b43371801b62ffa13d29bebe51be8d5a36da563b87bb094a49 SHA512 df7908769fd13a1cb2e0491d3773577db40c0f1c010b887c6dc6d7e0bc0b408fbfc260e6d5a2a34975e5b424152c7f558b33aeedea45f366636739295641394b WHIRLPOOL 47642c52928d84a50c01adfb8afa49c0c9376cba3b0f709d0c5113cba3380e047ded04980ffad339deeb1ce6d3a8ec59f58cf1968223973def7074a446a09da5
 DIST bacula-7.4.4.tar.gz 3312271 SHA256 01a53d4501b17aeea0c25f0b63e49b4586ac221107834a6c471c43bc602c4c47 SHA512 37f1fd0d91f027fc12cd43b5e575abf0f8d9ccad805775bd308a06cff843b77cfc599e0d45eaf83536c1be669a5189c35744b5774adaefa606fed31d63888029 WHIRLPOOL 53a45d30b2188cacfa092dae4f791c4bb9c3cd4fc0f30fa2fc1e212dfdaccb1fc50a3b709f2d69e71458916916e887362f09a1aabe0219c34867bb6c4d93d0e9
 DIST bacula-7.4.6.tar.gz 3312673 SHA256 4e8ea321b64cd49e29aecbdd3cb0dc10615302b18e2f26ffa7e7c82362c1cfed SHA512 2d8c47d184dd5d611bf3d209f0d39b0d2e60763bbb757a393c1ddb2fb361de855a4d53d4cbd76f4fda555cc7c069e79eefcb57fc01389a98dec6dc7815d0cde7 WHIRLPOOL d8831459a8f70a8a6b3b03b6b366ac62181ab2241f9bbf9fad46df95df1923873ec32795dd382c2c3fe66170b573d2ed54802e3784a47beed33aefd17ab84417
+DIST bacula-7.4.7.tar.gz 3312991 SHA256 6f6075c2ca90a63cdeeca39b0b82a3ea07ce9999dedc68951d88bed7fbc0be40 SHA512 2dcffe3f02de8e7dedc11f58aeca58fb95486757579065564753376d3fab7699d7577c189d0d34f8490706d773cd6a95d42ef1f35facb95e6fff10dad085c0d0 WHIRLPOOL bc897086f8589d952c6b9dad7751278d21be5e51d9bbcfd2c697f95191ca1295127bb0f06b98c1f05a13e9f7cd0ef61ce7aba87f3cd8d0503168114c9ad96c93

app-backup/bacula/bacula-7.4.7.ebuild

@@ -0,0 +1,412 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils multilib qt4-r2 systemd user libtool
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Featureful client/server network backup suite"
+HOMEPAGE="http://www.bacula.org/"
+SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X"
+
+DEPEND="
+	dev-libs/gmp:0
+	!bacula-clientonly? (
+		postgres? ( dev-db/postgresql:=[threads] )
+		mysql? ( virtual/mysql )
+		sqlite? ( dev-db/sqlite:3 )
+		!bacula-nodir? ( virtual/mta )
+	)
+	qt4? (
+		dev-qt/qtsvg:4
+		x11-libs/qwt:5
+	)
+	logwatch? ( sys-apps/logwatch )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( sys-libs/readline:0 )
+	static? (
+		acl? ( virtual/acl[static-libs] )
+		sys-libs/zlib[static-libs]
+		dev-libs/lzo[static-libs]
+		sys-libs/ncurses:=[static-libs]
+		ssl? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+	)
+	!static? (
+		acl? ( virtual/acl )
+		sys-libs/zlib
+		dev-libs/lzo
+		sys-libs/ncurses:=
+		ssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+RDEPEND="${DEPEND}
+	!bacula-clientonly? (
+		!bacula-nosd? (
+			sys-block/mtx
+			app-arch/mt-st
+		)
+	)
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly )
+				static? ( bacula-clientonly )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	#XOR and !bacula-clientonly controlled by REQUIRED_USE
+	use mysql && export mydbtype="mysql"
+	use postgres && export mydbtype="postgresql"
+	use sqlite && export mydbtype="sqlite3"
+
+	# create the daemon group and user
+	if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
+		enewgroup bacula
+		einfo
+		einfo "The group 'bacula' has been created. Any users you add to this"
+		einfo "group have access to files created by the daemons."
+		einfo
+	fi
+
+	if use bacula-clientonly && use static && use qt4; then
+		ewarn
+		ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
+		ewarn
+	fi
+
+	if ! use bacula-clientonly; then
+		if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
+			enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
+			einfo
+			einfo "The user 'bacula' has been created.  Please see the bacula manual"
+			einfo "for information about running bacula as a non-root user."
+			einfo
+		fi
+	fi
+}
+
+src_prepare() {
+	# adjusts default configuration files for several binaries
+	# to /etc/bacula/<config> instead of ./<config>
+	pushd src >&/dev/null || die
+	for f in console/console.c dird/dird.c filed/filed.c \
+		stored/bcopy.c stored/bextract.c stored/bls.c \
+		stored/bscan.c stored/btape.c stored/stored.c \
+		qt-console/main.cpp; do
+		sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
+			|| die "sed on ${f} failed"
+	done
+	popd >&/dev/null || die
+
+	# bug 466688 drop deprecated categories from Desktop file
+	sed -i -e 's/Application;//' scripts/bat.desktop.in || die
+
+	# bug 466690 Use CXXFLAGS instead of CFLAGS
+	sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || die
+
+	# drop automatic install of unneeded documentation (for bug 356499)
+	epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-doc.patch
+
+	# bug #310087
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
+
+	# bug #311161
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
+
+	# bat needs to respect LDFLAGS
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
+
+	# bug #328701
+	epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
+
+	epatch "${FILESDIR}"/7.2.0/${PN}-7.2.0-fix-static.patch
+
+	# fix soname in libbaccat.so bug #602952
+	epatch "${FILESDIR}/bacula-fix-sonames.patch"
+
+	# do not strip binaries
+	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
+	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+
+	# fix file not found error during make depend
+	epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
+
+	# Fix systemd unit files:
+	# bug 497748
+	sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
+	sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
+	# bug 504370
+	sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
+	# bug 584442 and 504368
+	sed -i -e 's/@dir_user@/root/g' platforms/systemd/bacula-dir.service.in || die
+
+	# fix bundled libtool (bug 466696)
+	# But first move directory with M4 macros out of the way.
+	# It is only needed by autoconf and gives errors during elibtoolize.
+	mv autoconf/libtool autoconf/libtool1 || die
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=''
+
+	if use bacula-clientonly; then
+		myconf="${myconf} \
+			$(use_enable bacula-clientonly client-only) \
+			$(use_enable !static libtool) \
+			$(use_enable static static-cons) \
+			$(use_enable static static-fd)"
+	else
+		myconf="${myconf} \
+			$(use_enable !bacula-nodir build-dird) \
+			$(use_enable !bacula-nosd build-stored)"
+		# bug #311099
+		# database support needed by dir-only *and* sd-only
+		# build as well (for building bscan, btape, etc.)
+		myconf="${myconf} \
+			--with-${mydbtype} \
+			--enable-batch-insert"
+	fi
+
+	# do not build bat if 'static' clientonly
+	if ! use bacula-clientonly || ! use static; then
+		myconf="${myconf} \
+			$(use_enable qt4 bat)"
+	fi
+
+	myconf="${myconf} \
+		$(use_with X x) \
+		$(use_enable !readline conio) \
+		$(use_enable readline) \
+		$(use_with readline readline /usr) \
+		$(use_with ssl openssl) \
+		$(use_enable ipv6) \
+		$(use_enable acl) \
+		$(use_with tcpd tcp-wrappers)"
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-pid-dir=/var/run \
+		--sysconfdir=/etc/bacula \
+		--with-subsys-dir=/var/lock/subsys \
+		--with-working-dir=/var/lib/bacula \
+		--with-logdir=/var/lib/bacula \
+		--with-scriptdir=/usr/libexec/bacula \
+		--with-systemd=$(systemd_get_unitdir) \
+		--with-dir-user=bacula \
+		--with-dir-group=bacula \
+		--with-sd-user=root \
+		--with-sd-group=bacula \
+		--with-fd-user=root \
+		--with-fd-group=bacula \
+		--enable-smartalloc \
+		--disable-afs \
+		--host=${CHOST} \
+		${myconf}
+	# correct configuration for QT based bat
+	if use qt4 ; then
+		pushd src/qt-console
+		eqmake4
+		popd
+	fi
+}
+
+src_compile() {
+	# Make build log verbose (bug #447806)
+	emake NO_ECHO=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doicon scripts/bacula.png
+
+	# install bat icon and desktop file when enabled
+	# (for some reason ./configure doesn't pick this up)
+	if use qt4 && ! use static ; then
+		doicon src/qt-console/images/bat_icon.png
+		domenu scripts/bat.desktop
+	fi
+
+	# remove some scripts we don't need at all
+	rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
+
+	# rename statically linked apps
+	if use bacula-clientonly && use static ; then
+		pushd "${D}"/usr/sbin || die
+		mv static-bacula-fd bacula-fd || die
+		mv static-bconsole bconsole || die
+		popd || die
+	fi
+
+	# extra files which 'make install' doesn't cover
+	if ! use bacula-clientonly; then
+	    # the database update scripts
+		diropts -m0750
+		insinto /usr/libexec/bacula/updatedb
+		insopts -m0754
+		doins "${S}"/updatedb/*
+		fperms 0640 /usr/libexec/bacula/updatedb/README
+
+		# the logrotate configuration
+		# (now unconditional wrt bug #258187)
+		diropts -m0755
+		insinto /etc/logrotate.d
+		insopts -m0644
+		newins "${S}"/scripts/logrotate bacula
+
+		# the logwatch scripts
+		if use logwatch; then
+			diropts -m0750
+			dodir /etc/log.d/scripts/services
+			dodir /etc/log.d/scripts/shared
+			dodir /etc/log.d/conf/logfiles
+			dodir /etc/log.d/conf/services
+			pushd "${S}"/scripts/logwatch >&/dev/null || die
+			emake DESTDIR="${D}" install
+			popd >&/dev/null || die
+		fi
+	fi
+
+	if ! use qt4; then
+		rm -vf "${D}"/usr/share/man/man1/bat.1*
+	fi
+	rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
+	if use bacula-clientonly || use bacula-nodir; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
+		rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
+		rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
+		rm -vf "${D}"/usr/libexec/bacula/create_*_database
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_database
+		rm -vf "${D}"/usr/libexec/bacula/make_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/update_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
+		rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
+		rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
+	fi
+	if use bacula-clientonly || use bacula-nosd; then
+		rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
+		rm -vf "${D}"/usr/share/man/man8/bcopy.8*
+		rm -vf "${D}"/usr/share/man/man8/bextract.8*
+		rm -vf "${D}"/usr/share/man/man8/bls.8*
+		rm -vf "${D}"/usr/share/man/man8/bscan.8*
+		rm -vf "${D}"/usr/share/man/man8/btape.8*
+		rm -vf "${D}"/usr/libexec/bacula/disk-changer
+		rm -vf "${D}"/usr/libexec/bacula/mtx-changer
+		rm -vf "${D}"/usr/libexec/bacula/dvd-handler
+	fi
+
+	# documentation
+	dodoc ChangeLog ReleaseNotes SUPPORT
+
+	# install examples (bug #457504)
+	if use examples; then
+		docinto examples/
+		dodoc -r examples/*
+	fi
+
+	# vim-files
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/bacula.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		newins scripts/filetype.vim bacula_ft.vim
+	fi
+
+	# setup init scripts
+	myscripts="bacula-fd"
+	if ! use bacula-clientonly; then
+		if ! use bacula-nodir; then
+			myscripts="${myscripts} bacula-dir"
+		fi
+		if ! use bacula-nosd; then
+			myscripts="${myscripts} bacula-sd"
+		fi
+	fi
+	for script in ${myscripts}; do
+		# copy over init script and config to a temporary location
+		# so we can modify them as needed
+		cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
+		cp "${FILESDIR}/newscripts/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
+
+		# now set the database dependancy for the director init script
+		case "${script}" in
+			bacula-dir)
+				case "${mydbtype}" in
+					sqlite3)
+						# sqlite databases don't have a daemon
+						sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
+						;;
+					*)
+						# all other databases have daemons
+						sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
+						;;
+				esac
+				;;
+			*)
+				;;
+		esac
+
+		# install init script and config
+		newinitd "${T}/${script}".initd "${script}"
+		newconfd "${T}/${script}".confd "${script}"
+	done
+
+	systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
+
+	# make sure the working directory exists
+	diropts -m0750
+	keepdir /var/lib/bacula
+
+	# make sure bacula group can execute bacula libexec scripts
+	fowners -R root:bacula /usr/libexec/bacula
+}
+
+pkg_postinst() {
+	if use bacula-clientonly; then
+		fowners root:bacula /var/lib/bacula
+	else
+		fowners bacula:bacula /var/lib/bacula
+	fi
+
+	if ! use bacula-clientonly && ! use bacula-nodir; then
+		einfo
+		einfo "If this is a new install, you must create the ${mydbtype} databases with:"
+		einfo "  /usr/libexec/bacula/create_${mydbtype}_database"
+		einfo "  /usr/libexec/bacula/make_${mydbtype}_tables"
+		einfo "  /usr/libexec/bacula/grant_${mydbtype}_privileges"
+		einfo
+
+		ewarn "ATTENTION!"
+		ewarn "The format of the database may have changed."
+		ewarn "If you just upgraded from a version below 7.2.0 you must run"
+		ewarn "'update_bacula_tables' now."
+		ewarn "Make sure to have a backup of your catalog before."
+		ewarn
+	fi
+
+	if use sqlite; then
+		einfo
+		einfo "Be aware that Bacula does not officially support SQLite database anymore."
+		einfo "Best use it only for a client-only installation. See Bug #445540."
+		einfo
+	fi
+
+	einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
+	einfo "you have to enable 'USE=qt4'."
+	einfo
+}

app-emulation/vagrant/Manifest

@@ -1,2 +1,2 @@
-DIST vagrant-1.9.1.tar.gz 1762644 SHA256 ed30e5a277b5614ee83d9417793ed2af870977368c2b0344855694040c4d6449 SHA512 07ea6e2d881806ce61395a30abdaa7b4f7c2c39bb909d6c6e0aa14101945a9a26078ed18ebb8e238d97f05ee060564fb290615ac4868b80ee29b64b88a666452 WHIRLPOOL 16ece1985a78942c75774181c803e42ffe81cd0580314372932af6a3c5084b43f8d3db0d6137eaa3186a9cdbf33e8e9d59f27f95be6ebe2ed5d93a90577e7fb9
 DIST vagrant-1.9.2.tar.gz 1813028 SHA256 53723eec1180ed0e89c1968e06626c6d45e42f6dc25ae9934ca8dfc240a82046 SHA512 26e2a933571b076fae27ea13e0f86529e39ebc3eb7580781d9cfa81bff2383f4dee72b947b3d2cb4f4bd231769f27da27b95e10f43b5207b824cd22b1e2403b6 WHIRLPOOL 9401ba1d21d20cf4a0f1c74775e077d9fad27edfbcb21f96579ff6cf6d7e8ab734cd0832f20ff568f7346633b80dee2fbc897ca34f08bc6868add7d274330d76
+DIST vagrant-1.9.3.tar.gz 1819192 SHA256 4b141f60e7e59e654b9a77eb137f208613349db331cdbfcd9a8354b8ebba5c00 SHA512 9adfeddd75821fda0ccdbd327861844752fb2d626ff5643527bd5af12ac2399b5565c6cbe5ca4d98f79dbeffd4408b29f57eb3cb967d9e47dafe247c31ffe3a8 WHIRLPOOL b34ca7e027ba2f209c41368c8191a1576b1cdd96a76e8e9f7cd91f0b1a2b0f23fa2e8c32b76a55a143c2fe4e15a7ae23faacd52bf14819d67f7ceeca3768f72d

app-emulation/vagrant/files/vagrant-1.9.3

@@ -4,7 +4,7 @@
 # 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.9.1"' )"
+VAGRANT_DIR="$( ruby -e 'print Gem::default_path[-1] + "/gems/vagrant-1.9.3"' )"
 
 # Export GEM_HOME based on VAGRANT_HOME
 #

app-emulation/vagrant/files/vagrant-1.9.3-thread-deadlock.patch

@@ -0,0 +1,98 @@
+From bfc2af4cf9c5e9280f0e7d74de226b7af7c18a2a Mon Sep 17 00:00:00 2001
+From: Chris Roberts <code@chrisroberts.org>
+Date: Mon, 27 Mar 2017 12:55:15 -0700
+Subject: [PATCH] Always provide timeout on thread join to prevent deadlock
+ errors
+
+---
+ lib/vagrant/batch_action.rb   | 6 ++++--
+ lib/vagrant/environment.rb    | 2 +-
+ lib/vagrant/shared_helpers.rb | 6 ++++++
+ lib/vagrant/ui.rb             | 6 +++---
+ 4 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/lib/vagrant/batch_action.rb b/lib/vagrant/batch_action.rb
+index 9b6900f..d27e87d 100644
+--- a/lib/vagrant/batch_action.rb
++++ b/lib/vagrant/batch_action.rb
+@@ -123,7 +123,9 @@ def run
+         # Set some attributes on the thread for later
+         thread[:machine] = machine
+ 
+-        thread.join if !par
++        if !par
++          thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive?
++        end
+         threads << thread
+       end
+ 
+@@ -131,7 +133,7 @@ def run
+ 
+       threads.each do |thread|
+         # Wait for the thread to complete
+-        thread.join
++        thread.join(THREAD_MAX_JOIN_TIMEOUT) while thread.alive?
+ 
+         # If the thread had an error, then store the error to show later
+         if thread[:error]
+diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
+index 8fad272..125070f 100644
+--- a/lib/vagrant/environment.rb
++++ b/lib/vagrant/environment.rb
+@@ -295,7 +295,7 @@ def batch(parallel=true)
+     #
+     # @return [Hash]
+     def checkpoint
+-      @checkpoint_thr.join
++      @checkpoint_thr.join(THREAD_MAX_JOIN_TIMEOUT)
+       return @checkpoint_thr[:result]
+     end
+ 
+diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb
+index c5d6ea6..5522272 100644
+--- a/lib/vagrant/shared_helpers.rb
++++ b/lib/vagrant/shared_helpers.rb
+@@ -12,6 +12,12 @@ module Vagrant
+   # @return [String]
+   DEFAULT_SERVER_URL = "https://atlas.hashicorp.com"
+ 
++  # Max number of seconds to wait for joining an active thread.
++  #
++  # @return [Integer]
++  # @note This is not the maxium time for a thread to complete.
++  THREAD_MAX_JOIN_TIMEOUT = 60
++
+   # This holds a global lock for the duration of the block. This should
+   # be invoked around anything that is modifying process state (such as
+   # environmental variables).
+diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
+index 8092493..2a52c90 100644
+--- a/lib/vagrant/ui.rb
++++ b/lib/vagrant/ui.rb
+@@ -53,7 +53,7 @@ def initialize_copy(original)
+             # We're being called in a trap-context. Wrap in a thread.
+             Thread.new do
+               @logger.info { "#{method}: #{message}" }
+-            end.join
++            end.join(THREAD_MAX_JOIN_TIMEOUT)
+           end
+         end
+       end
+@@ -128,7 +128,7 @@ def machine(type, *data)
+           @lock.synchronize do
+             safe_puts("#{Time.now.utc.to_i},#{target},#{type},#{data.join(",")}")
+           end
+-        end.join
++        end.join(THREAD_MAX_JOIN_TIMEOUT)
+       end
+     end
+ 
+@@ -244,7 +244,7 @@ def say(type, message, **opts)
+             safe_puts(format_message(type, message, **opts),
+                       io: channel, printer: printer)
+           end
+-        end.join
++        end.join(THREAD_MAX_JOIN_TIMEOUT)
+       end
+ 
+       def format_message(type, message, **opts)

app-emulation/vagrant/vagrant-1.9.3.ebuild

@@ -68,6 +68,9 @@ all_ruby_prepare() {
 
 	# fix rvm issue (bug #474476)
 	epatch "${FILESDIR}"/${PN}-1.8.1-rvm.patch
+
+	# fix thread deadlock (bug #616426)
+	epatch "${FILESDIR}"/${P}-thread-deadlock.patch
 }
 
 all_ruby_install() {

app-misc/recoll/recoll-1.22.4.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="camelcase doc +inotify qt4 qt5 session +spell"
 REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"

app-shells/bash-completion/Manifest

@@ -1,5 +1,6 @@
 DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba
 DIST bash-completion-2.3.tar.xz 272252 SHA256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9 SHA512 396c060fa39aa05866d26b573d6b9eebdb96e41a17ef723e95f8b01bbda32b0b83bf9e4d978a4f0a1c0590787ae797bb3b6417b95b877f8447037cb873ccf38a WHIRLPOOL fe5ebae1c77dfba504e8f79b130ba0bc80d882a045b980a23f4642e77dfb7bb79b529c1573b13fc0986f486c41696bb94fadef677e0cabfdffe7aeea6e8ff5c0
 DIST bash-completion-2.4.tar.xz 276148 SHA256 c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 WHIRLPOOL f38f148dcbca1ee47ec6fa33637ea0673c03816b607bd638605832fb76ec7fb5f24cba35cb559e8a5b06636b1ec0f225e420615b6721074fc405cb79b505b07b
+DIST bash-completion-2.5.tar.xz 276732 SHA256 b0b9540c65532825eca030f1241731383f89b2b65e80f3492c5dd2f0438c95cf SHA512 44ca2cbf38190c2bfa1e98021c1de36dbef0e55f9fe7840e83bd7f91b4c9afc92afa9bb03d53dbc6d9f9b468ac63ff1021a60e456fc239010010d75687eff3da WHIRLPOOL b488571aca9d8b027214c2964ec789ef616659a098a2bd65a921075d94a8014b51a802040535e44c7831b159a5094b6879935f726ee97409b575c36cd01dbc13
 DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250
 DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585

app-shells/bash-completion/bash-completion-2.5.ebuild

@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp"
+DEPEND="app-arch/xz-utils"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+STRIP_COMPLETIONS=(
+	# Slackware package stuff, quite generic names cause collisions
+	# (e.g. with sys-apps/pacman)
+	explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+	# Debian/Red Hat network stuff
+	ifdown ifup ifstatus
+
+	# Installed in app-editors/vim-core
+	xxd
+
+	# Now-dead symlinks to deprecated completions
+	hd ncal
+
+	# Installed by sys-apps/util-linux-2.28
+	mount umount mount.linux umount.linux
+)
+
+src_prepare() {
+	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() { :; } # Skip testsuite because of interactive shell wrt #477066
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	local file
+	for file in "${STRIP_COMPLETIONS[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+	done
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.1-r90 ${v}; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}

app-text/nfoview/nfoview-1.15.1.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 fdo-mime gnome2-utils
 if [[ ${PV} == "9999" ]] ; then

app-text/nfoview/nfoview-9999.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 fdo-mime gnome2-utils
 if [[ ${PV} == "9999" ]] ; then

app-text/pastebinit/pastebinit-1.5.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1

app-text/wklej/wklej-0.2.1-r1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
 
 inherit python-single-r1
 

app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1

dev-cpp/catch/Manifest

@@ -2,4 +2,5 @@ DIST Catch-1.5.6.tar.gz 312250 SHA256 1749521eb5c4b6e81128f60d66b81b8328e7605059
 DIST Catch-1.5.7.tar.gz 312824 SHA256 9acabf466e64ef2d477d4ce8d16610db3556a58b150440025fb1b25c3fd6a85b SHA512 724e85fbcb1a5ff8e98ef04932f7c60f43c0deaf4e41e4790cb7c0d9ead7b2e9068c801b165c094d68373b906c9d2d09de269bd7065dbd0136ecbb18ced4ccff WHIRLPOOL b0ce83cc75bbe40f3531c898fc273101a9992f5b7b43b9a483bf694b7c2fb079808f4330795fa1ae8bb5052fd55feb656245fc503f43217b42cf6239b620b167
 DIST Catch-1.5.8.tar.gz 312892 SHA256 08761b1930b37118b568838fd40eb6d113063c35ca8a37128298edd5559403a7 SHA512 18553b877ea6cbb48255f48bf025efc02dbc26f7895bf8f68391bc3417ae737ffab55e6b05c9c91c3d501ff581276cfd7678510db3333c5aff884d99bc38fb93 WHIRLPOOL f3c030e2a5b4beefdd00eee75a55052a92f07948cd8ce29da46cd83cd0a61991ca6cbf0ccd2ff89beee701a136b082a043a4dab9c140fcd0095905f518d99b6d
 DIST Catch-1.6.0.tar.gz 290987 SHA256 83532346983c43963cf89a69c1544be493e6b4cccaf20975e53f5cf2239b73a9 SHA512 6a9fbffd76d1fe6e4a2523c87e6ec6efcae66fc9db6dc5876b2839cfdb7c9918e8dc21b9b5ac4a545677c333659107c45f788d9a251f9d3bdd7731fd404132fe WHIRLPOOL 58257b3729f74f39034d9c9dccf178d0fe25c64f6b43ff606c52a0c2a8779b0ecd4b38b561e402bf4af70a52267d9499d5f22aab34755f02e20e04de4b9894f5
+DIST Catch-1.9.1.tar.gz 357082 SHA256 34fb5f7b8892654b123830eb9aa22e911ac4fac3fa14a1ebf51d21625a8a6cfa SHA512 40a212d5af2edf609909af6f420105508c15303e845af1f2b3a04ebafa24a0888dc51da94d0c3f0952410a408a2699870246a246f00fc0d835ee77e8ef8addac WHIRLPOOL ac26d7c17b8a86d00689d93b0379dd8260788cfb670a129936ddc336d5b450713873c39665693fc0de44ef4e61a34e692e736a710a2d5204d115bb26e388d161
 DIST catch-1.5.0.tar.gz 311787 SHA256 f694634bc56422f28d61052eedc29d43ea20e60a1726eda3ff9acc8fdfca3c08 SHA512 d7011cdfe6eca86aa081b5da371665be8687bcbb41f3702c3075bf01f73e1d2e00894a0917e6437a8735e730ff287a06e189ce94ea00e583ab7282065f25166d WHIRLPOOL 90d7d6d2f4b06169224385e0f2ec0de1312c454a0c7a2a14155f68fe30424e527cde91e5fb4ff9bd441fa846a7caabca023e591ce5837f6c65f0bbe106166401

dev-cpp/catch/catch-1.9.1.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/philsquared/Catch"
+SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${P^}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${P^}
+
+# CMake is only used to build & run tests, so override phases
+src_configure() { :; }
+src_compile() { :; }
+
+src_test() {
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	cmake-utils_src_test
+}
+
+src_install() {
+	# same location as used in fedora
+	insinto /usr/include/catch
+	doins -r include/.
+	dodoc -r docs/.
+}

dev-db/pgxnclient/pgxnclient-1.2.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 

dev-db/redis/metadata.xml

@@ -7,10 +7,6 @@
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <use>
     <flag name="jemalloc">
       Use <pkg>dev-libs/jemalloc</pkg> for allocations.

dev-lang/perl/perl-5.24.1-r1.ebuild

@@ -29,7 +29,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="

dev-libs/marisa/marisa-0.2.4.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 eutils

dev-libs/serd/serd-0.26.0.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils
 

dev-libs/sord/sord-0.16.0.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils
 

dev-perl/Text-CSV_XS/Text-CSV_XS-1.280.0.ebuild

@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Comma-separated values manipulation routines"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild

@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+IUSE=""
+DESCRIPTION="Provides an interface for creating simple JS scripts within PHP"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+src_install() {
+	insinto /usr/share/php/HTML
+	doins -r Javascript Javascript.php
+	php-pear-r2_install_packagexml
+	einstalldocs
+}

dev-php/PEAR-HTML_Template_Flexy/Manifest

@@ -1 +1,2 @@
 DIST HTML_Template_Flexy-1.3.12.tgz 201627 SHA256 72bc9f976fc161ede90fefd0d83ecc4551d7c339bcd0f95ebfdc663fe1c0bc75 SHA512 ef3c957502f2874560affbc95fdbd8474f714ce1d5d0672189c7ec74b2daeca79621504f57dffd25a924a09e4e295a5975b7c3ce2b182a648081b3b1454f9b26 WHIRLPOOL ca1fedc835518c9d8078fbf901e443fdeece2c7fc3d53a2a357722b60acc4d569339864537d92dc39566b9f8fb71fc544d3698971bc0a1bccf80275059d1be0d
+DIST HTML_Template_Flexy-1.3.13.tgz 213779 SHA256 99cd9c5d02d3b51f239095c617a16daa96561f4ff1780879d4f7037aaeb52ba6 SHA512 c99257c6f5451dbd2176251295f425950e359b2c0e76c1627718b4306ac12417eee697882250b4b5571397d8e47d6b3110770d66ebc91d021cb66064b86b5ad2 WHIRLPOOL a1eb4d1af88c92ba449474c9d1cb61b59ae6c9d10875feeea564ff8acc15e3af9573223903e38ad3ec02971a06de91066718d6f1c1b244c96d691cde1f682270

dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild

@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="An extremely powerful Tokenizer driven Template engine"
+LICENSE="PHP-2.02"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal"
+RDEPEND="!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1
+	dev-php/PEAR-File_Gettext )"
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}/${PV}-postrelease-fixes.patch" )
+	default
+}

dev-php/PEAR-HTML_Template_Flexy/files/1.3.13-postrelease-fixes.patch

@@ -0,0 +1,55 @@
+--- a/HTML/Template/Flexy.php	2016/05/26 03:59:27	339237
++++ a/HTML/Template/Flexy.php	2016/05/26 04:01:15	339238
+@@ -241,7 +241,7 @@
+     *   @param    array    $options (Optional)
+     */
+       
+-    function HTML_Template_Flexy( $options=array() )
++    function __construct( $options=array() )
+     {
+         
+         $baseoptions = array();
+@@ -288,6 +288,7 @@
+         $ret = false;
+         foreach ($dirs as $tmplDir) {
+             if (@!file_exists($tmplDir . DIRECTORY_SEPARATOR .$file)) {
++                $this->debug("skip no file: $tmplDir/$file");
+                 continue;
+             }
+             
+@@ -296,10 +297,12 @@
+                         "<BR>{$this->currentTemplate }<BR>{$tmplDir}" . DIRECTORY_SEPARATOR . $file,  
+                         HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS , HTML_TEMPLATE_FLEXY_ERROR_DIE);
+             }
+-            
++            $this->debug("found file: $tmplDir/$file");
+             $ret = $tmplDir;
+             
+         }
++        $this->debug("using file: $ret/$file");
++            
+         return $ret;
+         
+     }
+--- a/HTML/Template/Flexy/Compiler.php	2015/03/02 22:50:57	336027
++++ a/HTML/Template/Flexy/Compiler.php	2016/05/26 04:01:15	339238
+@@ -90,7 +90,7 @@
+     * @return   string   to compile (if not using a file as the source)
+     * @access   public
+     */
+-    function compile(&$flexy,$string = false) 
++    function compile($flexy,$string = false) 
+     {
+         echo "No compiler implemented!";
+     }
+--- a/HTML/Template/Flexy/Element.php	2016/05/26 03:59:27	339237
++++ a/HTML/Template/Flexy/Element.php	2016/05/26 04:01:15	339238
+@@ -127,7 +127,7 @@
+      *                                   or HTML attributes name="value" pairs
+      * @access   public
+      */
+-    function HTML_Template_Flexy_Element($tag='', $attributes=null)
++    function __construct($tag='', $attributes=null)
+     {
+         
+         $this->tag = strtolower($tag);

dev-php/PEAR-MDB2/Manifest

@@ -1,2 +1 @@
-DIST MDB2-2.5.0b3.tgz 130865 SHA256 890356688565b76f0d756496409d04629950f32f4bdf01f0d5edb4a3e9a036fb SHA512 5e0e9869db5326bcd5e8908dd23afd0f8518bfe69d6e5c274fbd6822728c8ce9084ca69ac329a687c3ea1275d5817a73a7e34fc6e36e587abe2a5fac6bdf2ffd WHIRLPOOL 565c70e0d0b5f41e1db5cff2f8deb78ad4aa6e43ae60c4c0846d6216fc853ddd82789f8041e5919cd60421fc0e1ac0fd7afbdb45147c7ec45c110e45772f697e
 DIST MDB2-2.5.0b5.tgz 136834 SHA256 c4ab3cf8cea4aacff02d729998b0ac80b4f92c2cc8055956079b323a406d985b SHA512 76381594070d250f4428eebeaa4867e72b2be0723ec592ff4f0fba089823e97de057f93e630a5cb226ca2f67028bee57072a0af30677728d614d7a7242c6c6fc WHIRLPOOL b7d3bacae9d365a8e6e73e10812ce22b2695224a413bb887a14d6e8a4426c6082992c16d4c3b1d6c357b11068a96051f5f4bb76bf914c11e92861c2a5c27fe62

dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta3.ebuild

@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="firebird mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
-
-RDEPEND=">=dev-php/pear-1.9.1"
-DEPEND="${RDEPEND}"
-
-PDEPEND="firebird? ( >=dev-php/PEAR-MDB2_Driver_ibase-1.5.0_beta3 )
-	mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta3 )
-	mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta3 )
-	mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta3 )
-	oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta3 )
-	oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta3 )
-	postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta3 )"

dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild

@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
 
 RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"

dev-php/PEAR-MDB2_Driver_mssql/Manifest

@@ -1,2 +1 @@
-DIST MDB2_Driver_mssql-1.5.0b3.tgz 36617 SHA256 82b7005cce10b0c7ef15e3912fd51000ea018a4a3fd0530ecf21a9336f9e13c2 SHA512 b2831086f0dcb74415f49e53e168739ccb6165cbba83bf5e15f4804ec19cd645284c576b67bad39d5dd70a6e1c30837eb487fff3da931a0092dee6be04783069 WHIRLPOOL b142676ffdb672ff0c1175004031345c0afe0a7d0d1d88fb0b8b1c953b58260a2ef8c1d4b45149a56eed7a90a672a862ab778790aff192427aed8e2bde881de1
 DIST MDB2_Driver_mssql-1.5.0b4.tgz 37246 SHA256 ba19c44d6c04ad9984e91969584371e7129927d70affb55f2549d6bd88f2276d SHA512 9d8634508eaaed7ed35c4a2e61dcd31a20049f519dafeb6ac07541c4121ebe6efebf1db42d0352aea90971f3fd272085278fef0aabce4a527cf61bb7205321cd WHIRLPOOL 3d0468c7be4532450d45d360bec65333efdd2bc08504d0e2464746d0a40d854b80b54375c1a1f5c229be465b1ade92bdbd1cd7cef0c692f32cf4d0bff4185206

dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta3.ebuild

@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer, mssql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
-		dev-lang/php[mssql]"
-RDEPEND="${DEPEND}"

dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild

@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mssql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3

dev-php/PEAR-MDB2_Driver_mysql/Manifest

@@ -1,2 +1 @@
-DIST MDB2_Driver_mysql-1.5.0b3.tgz 45734 SHA256 341f876e5acfc2e373746899fab6d538169aba67b323688d7c638561954b74ea SHA512 e756b1ae75c74673fa6eea1a0e31f4fa38b7b490751bb7ccdaf331266dd4d3d4aeacf41a919d2a7641ec8364b5cd737bb5da5ee4bda976f3f50f4bbf2c20babb WHIRLPOOL b9ba0df4e6eef37e62ad11be38c529b6fd4b79e02987ee30e98a6573654db8e3fc94b85873006b6d0eb2386fb56706ff87d1853e34b900756966a3a1cfe3622f
 DIST MDB2_Driver_mysql-1.5.0b4.tgz 47418 SHA256 df9345235a8e707d9c81fbd6d5efd12e20c563a54a40d48bc411148118b5199a SHA512 a90cb358980b348747f33ac8047eddb151246ab55aae12d2af186c7e228397b12f7b90a881dc03e6a84e398147fb4501fc6d10175eca70cef5b962ef2665bdba WHIRLPOOL b0d4d0a0cf9edb0c8c348f4f27f69d0e350d31b1354ef868cd01400fc3e4e47046c7f485f67b11bc1d46de146184064df367dfdd3047c072a843cc4bccd79006

dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta3.ebuild

@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer, mysql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
-		dev-lang/php[mysql]"
-RDEPEND="${DEPEND}"

dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1.ebuild

@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mysql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3

dev-php/PEAR-MDB2_Driver_mysqli/Manifest

@@ -1,2 +1 @@
-DIST MDB2_Driver_mysqli-1.5.0b3.tgz 47380 SHA256 1e74215f5c4c5617ef2445e126cd0866826d12d2e81048947a78203bcd5375aa SHA512 03ce1066f5a2bba440dec0c4d84eca314f73553578b9881860bd04383d1b6685829bdca41b18e1437f236c5fa3c033ddca8c91d9a7b5fb3eb23ad5a06175f66a WHIRLPOOL be67fcc3c2e423ff2d7242a09c73d8c26ee0ca550fd9a9d4c052c70c70637b66b62ac7666163840e0f32ac2a0effcabf82568a7e1323c2079acb63c2e1ab506b
 DIST MDB2_Driver_mysqli-1.5.0b4.tgz 49450 SHA256 d5d4d24a1b263f32686d257a5563797460e589311f3c571094b35f1c87fbbaf5 SHA512 cb4ba5b34b241f1eb6da72e63f47a99c939ac895530b20d077cf94fa96a9b36826aa128386ffa10e51488f8f3e93da9015805f6f28ddb8729e2812ff240ea894 WHIRLPOOL cb3ebe9d9b9818179cb3f7c6e9c7d9b2e3c83431871929929f25d801974fbe256058efa00830ff56cdc44c90251b18312bcb3cb6a5fa606d70965f8c8b45584d

dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta3.ebuild

@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer, mysqli driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
-		dev-lang/php[mysqli]"
-RDEPEND="${DEPEND}"

dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild

@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mysqli driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3

dev-php/PEAR-MDB2_Driver_oci8/Manifest

@@ -1,2 +1 @@
-DIST MDB2_Driver_oci8-1.5.0b3.tgz 43707 SHA256 def17cedeca82c7170ac091f6525313f4fce324dcf8f8f4af65a877263e1ea97 SHA512 7e1a9196fffa5c1e5d70456e64efc472a816b67c11e6b72487e81fe13d6002b369659411dbd512730f3efc9503ad50f86153837e46c06ed7a177af638cf64768 WHIRLPOOL 3c56164e0ef35968db43a8f2c34338b5437d17c48e4444d41bfcf256e49b668805c8c7b6ad5767c04600180525b88795732b0eda362277bd9cd19d4763979285
 DIST MDB2_Driver_oci8-1.5.0b4.tgz 44672 SHA256 84c64ef34e830f738c962ff86368ea91cc51924b926fca59ce7fa1777eb22ce7 SHA512 2b4327a06c43cb28a16ead10855377a6501bddfe30397b5af9c7037ce67394e9a9815578b24bfafcf0c8c20ab87fff89f7803b5b99afa5e5d2a278c78588c3d2 WHIRLPOOL 3d086f29e0c8db7b5992239055dea2c41cab449bec2412534245848292a1bdec53066040c57c025bdcd1c2bcda8164fd5f9524f593f9c3c197a7360a72f2111f

dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta3.ebuild

@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer, oci8 driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
-		|| ( dev-lang/php[oci8] dev-lang/php[oci8-instant-client] )"
-RDEPEND="${DEPEND}"

dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild

@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, oci8 driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3

dev-php/PEAR-MDB2_Driver_pgsql/Manifest

@@ -1,2 +1 @@
-DIST MDB2_Driver_pgsql-1.5.0b3.tgz 41214 SHA256 b5bbe7dd75b21903f10be7783252c1d83d04ad0e9a201a1b7ee6b43d344e7938 SHA512 19b1be01d6f27b858d6537e0732d02fa86fe3763b8fd5dd8937f679c0fde503b87ed4e3168474b936dc8e0846b4f8e9f094dbf46bf8094286f8f6a60ec2a13a0 WHIRLPOOL c2969ad11847bc73f6dfc4b4cebceee0bd4a7606cd27e59cf9e95c4a425a329cb9d9f3090cd98418ab86dc746911cf07796619e3ed3fe7ef29f6a68705a6a626
 DIST MDB2_Driver_pgsql-1.5.0b4.tgz 42404 SHA256 4d6a74464e3f5c76c834c940b6e5c1b17acc717a298fd1949db5a5f74fe4df33 SHA512 3beda16ee937f3f3af9217f778ae21bb67abe21bf338efa7fc7df0d512bad41cea5b10d4be26bc8055a0107cb14a814ae5da3db2d4346d479082d31cd1cec091 WHIRLPOOL 9765370b8ba2f026ae3e745159e5b31314131b7044e0e585956aa1f2ab8bcda8e165a43eed398681a7621cda36d152c4b43f10d2835c6c55662c1e343095087d

dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta3.ebuild

@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit php-pear-r1
-
-DESCRIPTION="Database Abstraction Layer, pgsql driver"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
-		dev-lang/php[postgres]"
-RDEPEND="${DEPEND}"

dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild

@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, pgsql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3

dev-php/symfony-config/symfony-config-2.8.15-r1.ebuild

@@ -14,7 +14,8 @@ IUSE="test"
 
 RDEPEND="
 	dev-lang/php:*
-	dev-php/fedora-autoloader"
+	dev-php/fedora-autoloader
+	dev-php/symfony-filesystem"
 DEPEND="
 	test? (
 		${RDEPEND}

dev-python/PyGithub/PyGithub-1.28.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 

dev-python/astng/astng-0.24.3.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 

dev-python/attrdict/attrdict-2.0.0.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 

dev-python/authres/authres-0.800.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 

dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.3.ebuild

@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~x86"
+KEYWORDS="alpha amd64 ~arm ~x86"
 IUSE="doc test"
 
 DEPEND="

dev-python/cbor/cbor-1.0.0.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5})
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 

dev-python/configparser/configparser-3.5.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

dev-python/isort/isort-4.2.5.ebuild

@@ -12,5 +12,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

dev-python/logilab-common/logilab-common-1.2.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1

dev-python/lz4/lz4-0.9.0.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
 

dev-python/pyicu/pyicu-1.9.6.ebuild

@@ -18,42 +18,16 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/icu
-"
-# epydoc supports only python2*
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+	dev-libs/icu"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}/${MY_P}"
 
 DOCS=(CHANGES CREDITS README.md)
 
-# we need an exact version match for epydoc to work on a binary module
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
-
-python_compile_all() {
-	if use doc; then
-		mkdir -p doc/html || die
-		epydoc --html --verbose -o doc/html \
-			--url="${HOMEPAGE}" --name="${MY_P}" \
-			icu.py || die "Making the docs failed!"
-	fi
-}
-
 python_test() {
 	esetup.py test
 }
-
-python_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-	fi
-	distutils-r1_python_install_all
-}

dev-python/pylint/pylint-1.6.5-r1.ebuild

@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~x86"
+KEYWORDS="alpha amd64 ~arm ~x86"
 IUSE="doc examples test"
 
 RDEPEND="

dev-ruby/ox/Manifest

@@ -1,3 +1,4 @@
 DIST ox-2.4.11.tar.gz 191015 SHA256 fbd6f64dc1b38099b5a1e4cbc4726f1cf1f1541f4202f9565d4a59e3bf11fe45 SHA512 504820125127e2076d275d885d16e92f508b0e02728ecaec390a56dc57d5ab655bb76bf0e809c99a17c68e3eb1e38f217aca809ca76c3fe67152a544387e1a07 WHIRLPOOL 74dc44b8e85ac778aa8b0301d892ac021259ba4155447caaaae8b81f1385d9a76615770a1fea52743853c142ab6d2aed5c3d8cf3b273a8697be28d4cc7392c38
+DIST ox-2.4.13.tar.gz 191174 SHA256 a5918f804bc33a887c5f4663b665d96ab7fd2fc11c902baa572841b092767e79 SHA512 98ed5549ba58461ee02945c3862dce27b3c6330ee3669f207cf3d58f27767ff5c5ac9f9f8d640720bb5ed3380f0f37d45a850e25c43f72acc8f7f3ab069ec771 WHIRLPOOL 45602639bc137b0bd5e1fb887977d9d31dc448f10c8410c143770c68dd6468a78db4464c3bb981b62b9a3881b9a643e0d7bee09faf7dae2cd26d2e985efe69d6
 DIST ox-2.4.8.tar.gz 190593 SHA256 82e097857070369fe7b846a00ce5cb717e48b9ca5ed6acf03f823785290e1002 SHA512 9fc648551471eeda82e7c3a8eacd0522d6fad66e93ad8a60cab4956c8f70e3ca83c4a8afbe9374f6d97d99c8dc5144c332d27d6ae112525d3250e10530b18dcc WHIRLPOOL 2bf5d7ac87c0d6dd47851d262800dfd7fccc13146262747217d634a19a68fe3fd284686be3b07b19d7eeed49f5732e61a6695a39308064052cbf49300266fff3
 DIST ox-2.4.9.tar.gz 190749 SHA256 224352960b3238d08b7ff65f8067ede3c3415e63a12ba8be5377c2cb3b8481e2 SHA512 3f8ce25aa469940ece367e1c719638f74d70d8b6a809819c27cfcde4d3d047e3d571e883702c3c38008d739aee121e3412cf52d74f25d7b6ccd2cb616bd905f7 WHIRLPOOL 0588d20d1a5617053d1ca444d6d2fd58b7510ea2b7bd92497f65eebabf60623073f7fa9815ed968e3cf157d82ec12b57cd5742c24a7001c55d0e9f9ae67d8ce7

dev-ruby/ox/ox-2.4.13.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}

dev-util/abi-compliance-checker/Manifest

@@ -2,3 +2,4 @@ DIST abi-compliance-checker-1.99.21.tar.gz 230212 SHA256 c9ca13a9a7a0285214f9a18
 DIST abi-compliance-checker-1.99.22.tar.gz 230584 SHA256 da8d9c4f1d35d1ee355263b7f1b59c869e02fcb7cb764a695f8c730ce3dd5c2c SHA512 19c4f1dc93d724c8de102696f80eff592f052b69b5de62fceeea84a2add8a2d1f405f2af62253d188838118d0dccdb5791e36b3c64c0302d10534e296fdc8518 WHIRLPOOL f1ec4fe5553888bc95dc9bd3fe82cd8a4bf07fc3d4f9139520761701d1ca2962385d0d0d3eb7844337f39f9d719ceab6057182cbc55dc063245877a58151f28e
 DIST abi-compliance-checker-1.99.23.tar.gz 231478 SHA256 5d1a66e12b654798a09bdc087bb523bb38dd52bc6a212d604c18b547eb1ca2b2 SHA512 f09e0b5d9b04ab7ef20b19a1265d6dceb89c1c1aa4639f67b30ca60a66bbb748df6f95e2a540e650f96f296cc1b7bd972391a5fb9038e4834bd4860825db2b2e WHIRLPOOL 33288a8a12815cd2d8b1d52460979523f7df503a6290f74570fb8abf48b7e5609d7f7b3009379d6b5f5b4276be5def6dc6ef4e55696aa7a1d6e4aadf8314d664
 DIST abi-compliance-checker-1.99.25.tar.gz 233928 SHA256 b6d82df39c89be5c55ab13c4829223c0f17cf84c62d437350c06243f0a8b7380 SHA512 2a01dac2c95069432951abbaf5c8888ae2ba241370b6059663c835aad5a2dd8b6c853762861707d14fe386a2c4ba85d3a9ae1b4af346a1eb6fe5f28ea3173bad WHIRLPOOL fb349024cdb063156e6ee0a8405ef1dd61f809179062da3196ef18570f2c58b86448aa737bf143640187a053fbe77a420bfc695ed890428af9f0539fb8f77743
+DIST abi-compliance-checker-2.0.tar.gz 228921 SHA256 73194c9c00853c761b8c7c0e6fc581ae92e586884a5a7dcce2c5b556b437b6e1 SHA512 f1ee78113ac29814ecdf4130cd2ed2cbe24ffea65853cbdc8803a07b5d08dc8f7ffea9764c2ddf7a4a73eac1159fd13b3ce74cb0d7e412aacadacf6f59e7b663 WHIRLPOOL f5c34d7ef7a1b72bf1f1466a1cb3c77336aff2241d7c1e514ab57cc974f8213f0d7ead1e811d656377204f422db5a3ef9d9e60a83880a745e590ec56cd09b105

dev-util/abi-compliance-checker/abi-compliance-checker-2.0.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-util/abi-dumper
+	dev-util/ctags"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir /usr
+	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
+	einstalldocs
+}

dev-util/catfish/catfish-1.2.2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit eutils gnome2-utils python-single-r1
 
 DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"

dev-util/cdiff/cdiff-0.9.8.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1
 

dev-util/cligh/cligh-9999.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 git-2
 

dev-util/gprof2dot/gprof2dot-0_p20130517.ebuild

@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit eutils python-r1

gnome-extra/nemo/nemo-3.2.0.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_4 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit autotools eutils gnome2 python-any-r1 virtualx
 

gnustep-base/gnustep-back-art/Manifest

@@ -1 +1,2 @@
 DIST gnustep-back-0.25.0.tar.gz 974762 SHA256 4276e30e157fb450cc5144501e680e8142b484e6595e5e4f83d14225c60afa91 SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770 WHIRLPOOL 2dc49763ecf30e695ae13f8197b140c7d4b9ce17b19364f04bbd0ed0beb626d50943210ad4f1a5baad8ae7957c6c32e5193eaf40d532aabd3f5f455b89776574
+DIST gnustep-back-0.25.1.tar.gz 974775 SHA256 ea563b7d6e4bd8b13856306c94bfe06b0909b71e62ab70dccf1c208f4889e2bf SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656 WHIRLPOOL e4eabe3a6982f58672a17589fdf03db350eba7a0748ae617cf2fbbffa3a82f2daf7768141fdfee31abc5b102fd901be54545cd9dbc7d970c5b33a7e10c7c2f63

gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild

@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-base
+
+DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl xim"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	=gnustep-base/gnustep-gui-${PV%.*}*
+	opengl? ( virtual/opengl virtual/glu )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=media-libs/freetype-2.1.9
+
+	>=media-libs/libart_lgpl-2.3
+	>=gnustep-base/mknfonts-0.5-r1
+	media-fonts/dejavu
+
+	!gnustep-base/gnustep-back-cairo
+	!gnustep-base/gnustep-back-xlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+src_configure() {
+	egnustep_env
+
+	myconf="$(use_enable opengl glx)"
+	myconf="$myconf $(use_enable xim)"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=art"
+
+	econf $myconf
+}
+
+src_compile() {
+	gnustep-base_src_compile
+
+	# Create font lists for DejaVu
+	einfo "Generating nfonts support files"
+	(
+		cd Fonts
+		export "${GS_ENV[@]}"
+		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
+			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
+			|| die "nfonts support files creation failed"
+		# Trim whitepsaces
+		for fdir in *\ */; do
+			mv "$fdir" `echo $fdir | tr -d [:space:]`
+		done
+	)
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
+	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
+}
+
+gnustep_config_script() {
+	echo "echo ' * setting normal font to DejaVuSans'"
+	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
+	echo "echo ' * setting bold font to DejaVuSans-Bold'"
+	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
+	echo "echo ' * setting fixed font to DejaVuSansMono'"
+	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
+}

gnustep-base/gnustep-back-cairo/Manifest

@@ -1 +1,2 @@
 DIST gnustep-back-0.25.0.tar.gz 974762 SHA256 4276e30e157fb450cc5144501e680e8142b484e6595e5e4f83d14225c60afa91 SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770 WHIRLPOOL 2dc49763ecf30e695ae13f8197b140c7d4b9ce17b19364f04bbd0ed0beb626d50943210ad4f1a5baad8ae7957c6c32e5193eaf40d532aabd3f5f455b89776574
+DIST gnustep-back-0.25.1.tar.gz 974775 SHA256 ea563b7d6e4bd8b13856306c94bfe06b0909b71e62ab70dccf1c208f4889e2bf SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656 WHIRLPOOL e4eabe3a6982f58672a17589fdf03db350eba7a0748ae617cf2fbbffa3a82f2daf7768141fdfee31abc5b102fd901be54545cd9dbc7d970c5b33a7e10c7c2f63

gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnustep-base
+
+DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl xim"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	=gnustep-base/gnustep-gui-${PV%.*}*
+	opengl? ( virtual/opengl virtual/glu )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=media-libs/freetype-2.1.9
+
+	>=x11-libs/cairo-1.2.0[X]
+
+	!gnustep-base/gnustep-back-art
+	!gnustep-base/gnustep-back-xlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+src_configure() {
+	egnustep_env
+
+	myconf="$(use_enable opengl glx)"
+	myconf="$myconf $(use_enable xim)"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=cairo"
+
+	econf $myconf
+}

gnustep-base/gnustep-back-xlib/Manifest

@@ -1 +1,2 @@
 DIST gnustep-back-0.25.0.tar.gz 974762 SHA256 4276e30e157fb450cc5144501e680e8142b484e6595e5e4f83d14225c60afa91 SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770 WHIRLPOOL 2dc49763ecf30e695ae13f8197b140c7d4b9ce17b19364f04bbd0ed0beb626d50943210ad4f1a5baad8ae7957c6c32e5193eaf40d532aabd3f5f455b89776574
+DIST gnustep-back-0.25.1.tar.gz 974775 SHA256 ea563b7d6e4bd8b13856306c94bfe06b0909b71e62ab70dccf1c208f4889e2bf SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656 WHIRLPOOL e4eabe3a6982f58672a17589fdf03db350eba7a0748ae617cf2fbbffa3a82f2daf7768141fdfee31abc5b102fd901be54545cd9dbc7d970c5b33a7e10c7c2f63

gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-base
+
+DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl xim"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	=gnustep-base/gnustep-gui-${PV%.*}*
+	opengl? ( virtual/opengl virtual/glu )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=media-libs/freetype-2.1.9
+
+	!gnustep-base/gnustep-back-art
+	!gnustep-base/gnustep-back-cairo"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+src_configure() {
+	egnustep_env
+
+	myconf="$(use_enable opengl glx)"
+	myconf="$myconf $(use_enable xim)"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=xlib"
+
+	econf $myconf
+}

gnustep-base/gnustep-gui/Manifest

@@ -1 +1,2 @@
 DIST gnustep-gui-0.25.0.tar.gz 2882556 SHA256 c5756026b339a838db5465b76af6aeda01c21b4f7a2f40215c1fa792631f4e82 SHA512 568c0c9160febbd9bc563bfc7fbec024bc583a2d6ccfb54e527630f1e761a51f57f984a8b83f06cab97f85e3eec183386057fed2d551a383a16cecb60f102dc2 WHIRLPOOL 613dc1c492660a8ef6e335408b05a70ba4cd0d5c0f9468bad6abe107c6f38c15f4f313b79523e45d9e8f4db20b282bdbc5376694363c4dccb54b57e32b9709d1
+DIST gnustep-gui-0.25.1.tar.gz 2888779 SHA256 3aacb277976014cfd4394084066187430100657dea234da91d9ae5015e747c66 SHA512 d69416c471d4f2fc9971e4aaddc5471b13854d00be6e03b78c3e89f9e7f90285c9024fc6992811296434d5dadf8ac02bcb69a1ceaa1c651461f83778165328e8 WHIRLPOOL ec044f37cd3b6c607ee584d791662633ff7d26d9438dae29e38283398c8fdba66d64fc9930589fc9a99e5e9a7d2eaf27e3b35f8afe3a2fe3e0c00b96ccb1081c

gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-base multilib
+
+DESCRIPTION="Library of GUI classes written in Obj-C"
+HOMEPAGE="http://www.gnustep.org/"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cups gif icu jpeg png speech"
+
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	app-text/aspell
+	>=gnustep-base/gnustep-base-1.24.9[icu?]
+	media-libs/audiofile
+	>=media-libs/tiff-3:=
+	x11-libs/libXt
+	cups? ( >=net-print/cups-1.7.4:= )
+	gif? ( >=media-libs/giflib-4.1:= )
+	icu? ( dev-libs/icu:= )
+	jpeg? ( virtual/jpeg:= )
+	png? ( >=media-libs/libpng-1.2:= )
+	speech? ( app-accessibility/flite )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	gnustep-base_src_prepare
+
+	# remove hardcoded -g -Werror, bug #378179
+	sed -i -e 's/-g -Werror//' \
+		Tools/say/GNUmakefile \
+		Tools/speech/GNUmakefile \
+		|| die
+}
+
+src_configure() {
+	egnustep_env
+
+	local myconf=
+	use gif && myconf="--disable-ungif --enable-libgif"
+
+	econf \
+		$(use_enable cups) \
+		$(use_enable icu) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable speech) \
+		--with-tiff-include="${EPREFIX}"/usr/include \
+		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}

gnustep-base/gnustep-make/Manifest

@@ -1 +1,2 @@
 DIST gnustep-make-2.6.8.tar.gz 592266 SHA256 603ed2d1339b44d154ea25229330acdedb6784b9c802b3797b2fefe3d2200064 SHA512 1df6757cd1e0dbca3eb6e4ad4346406799ebb2782f5853014cc3b1e8ae47056026e6c5cd43e5671c8802232444602fde164dde352c15b4e0d64bdfdea06bd8a0 WHIRLPOOL d54b06a9082e0b19bdb779c2e3914c57a9ecbad2cbb18de8d6f5cbe07c68208c0e169ee6e8ff41e70d619b028d208ed4089afaa86250bcd7452ae8d90e40cfa8
+DIST gnustep-make-2.7.0.tar.gz 596399 SHA256 90a01cbfb68aafe01c4cc4123121ebd2da0e1e2076795b5682f0833fddf311ce SHA512 7a39c2c79f01c3a93607bba71ef8c482d0610541ebcb3d0ffce6c1a104a74646329d18255a8bd183ccf54f37018e4d6b4a9d8adf419e2cdea29b35c89e81d9a2 WHIRLPOOL e9d21c981be7ccf63e85e6187777ad8ebb31dbfacf88ef3887906ca63815d7efe7ec21a7aabab738df6e3de2c1eb5620eb967956c27d67e93678b6d3a0582d74

gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild

@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnustep-base prefix toolchain-funcs
+
+DESCRIPTION="GNUstep Makefile Package"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="libobjc2 native-exceptions"
+
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=sys-devel/make-3.75
+	libobjc2? ( gnustep-base/libobjc2
+		sys-devel/clang )
+	!libobjc2? ( !!gnustep-base/libobjc2
+		|| (
+			>=sys-devel/gcc-3.3[objc]
+			sys-devel/clang
+		) )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Determine libobjc.so to use
+	if use libobjc2; then
+		libobjc_version=libobjc.so.4
+	else
+		# Find version in active gcc
+		for ver in {2..5};
+		do
+			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x objective-c \
+				- <<<$'int main() {}' -o /dev/null 2> /dev/null;
+			then
+				libobjc_version=libobjc.so.${ver}
+			fi
+		done
+	fi
+
+	# Stop if we could not get libobjc.so
+	if [[ -z ${libobjc_version} ]]; then
+		eerror "${P} requires a working Objective-C runtime and a compiler with"
+		eerror "Objective-C support. Your current settings lack these requirements"
+		if ! use libobjc2;
+		then
+			eerror "Please switch your active compiler to gcc with USE=objc, or clang"
+		fi
+		die "Could not find Objective-C runtime"
+	fi
+
+	# For existing installations, determine if we will use another libobjc.so
+	if has_version gnustep-base/gnustep-make; then
+		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
+		# Old installations did not set this explicitely
+		: ${current_libobjc:=libobjc.so.2}
+
+		if [[ ${current_libobjc} != ${libobjc_version} ]]; then
+			ewarn "Warning: changed libobjc.so version!!"
+			ewarn "The libobjc.so version used for gnustep-make has changed"
+			ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
+			ewarn "You must rebuild all gnustep packages installed."
+			ewarn ""
+			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
+			ewarn "# gnustep-updater -l"
+		fi
+	fi
+
+	if use libobjc2; then
+		export CC=clang
+	fi
+}
+
+src_prepare() {
+	# Multilib-strict
+	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
+	cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
+	eprefixify "${T}"/gnustep-5.{csh,sh}
+
+	default
+}
+
+src_configure() {
+	#--enable-objc-nonfragile-abi: only working in clang for now
+	econf \
+		INSTALL="${EPREFIX}"/usr/bin/install \
+		--with-layout=fhs-system \
+		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
+		--with-objc-lib-flag=-l:${libobjc_version} \
+		$(use_enable libobjc2 objc-nonfragile-abi) \
+		$(use_enable native-exceptions native-objc-exceptions)
+}
+
+src_compile() {
+	emake
+	if use doc ; then
+		emake -C Documentation
+	fi
+}
+
+src_install() {
+	# Get GNUSTEP_* variables
+	. ./GNUstep.conf
+
+	local make_eval
+	use debug || make_eval="${make_eval} debug=no"
+	make_eval="${make_eval} verbose=yes"
+
+	emake ${make_eval} DESTDIR="${D}" install
+
+	# Copy the documentation
+	if use doc ; then
+		emake -C Documentation ${make_eval} DESTDIR="${D}" install
+	fi
+
+	dodoc FAQ README RELEASENOTES
+
+	exeinto /etc/profile.d
+	doexe "${T}"/gnustep-?.sh
+	doexe "${T}"/gnustep-?.csh
+}
+
+pkg_postinst() {
+	# Warn about new layout if old GNUstep directory is still here
+	if [ -e /usr/GNUstep/System ]; then
+		ewarn "Old layout directory detected (/usr/GNUstep/System)"
+		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
+		ewarn "You must first update the configuration files from this package,"
+		ewarn "then remerge all packages still installed with the old layout"
+		ewarn "You can use gnustep-base/gnustep-updater for this task"
+	fi
+}

licenses/linux-firmware

@@ -0,0 +1,7 @@
+Gentoo license note:
+
+Linux firmware images are distributed under a variety of licenses,
+many of them being non-free. Most likely, upstream redistribution of
+some firmware images may conflict with the licenses or lack thereof on
+the images. You will need to check the WHENCE and LICEN[CS]E.* files
+in the package for specific licensing terms.

media-gfx/digikam/digikam-5.5.0.ebuild

@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner X"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then

media-libs/aubio/aubio-0.4.5.ebuild

@@ -70,7 +70,7 @@ src_compile() {
 
 	if use doc; then
 		cd "${S}"/doc || die
-		doxygen full.cfg || die
+		emake dirhtml
 	fi
 
 	if use python ; then
@@ -105,6 +105,6 @@ src_install() {
 	if use doc; then
 		dodoc doc/*.txt
 		docinto html
-		dodoc -r doc/full/html/.
+		dodoc -r doc/_build/dirhtml/.
 	fi
 }

media-libs/lilv/lilv-0.24.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit base python-any-r1 waf-utils bash-completion-r1

media-libs/resid/resid-0.16_p2-r1.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal versionator
+
+MY_MAJ=$(get_version_component_range 1-2)
+
+DESCRIPTION="C++ library to emulate the C64 SID chip"
+HOMEPAGE="http://sidplay2.sourceforge.net"
+SRC_URI="mirror://sourceforge/sidplay2/${P/_p/-p}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="static-libs"
+
+S=${WORKDIR}/${PN}-${MY_MAJ}
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README THANKS TODO VC_CC_SUPPORT.txt
+)
+
+src_prepare() {
+	default
+
+	# This is required, otherwise the shared libraries get installed as
+	# libresid.0.0.0 instead of libresid.so.0.0.0.
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-dependency-tracking \
+		--enable-resid-install \
+		--enable-shared
+}
+
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}

media-libs/sratom/sratom-0.6.0.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils
 

media-libs/suil/suil-0.8.4.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-any-r1 waf-utils

media-plugins/kipi-plugins/kipi-plugins-5.5.0.ebuild

@@ -10,7 +10,7 @@ DESCRIPTION="Plugins for the KDE Image Plugin Interface"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="flashexport mediawiki +remotestorage vkontakte"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then

media-plugins/mda-lv2/mda-lv2-1.2.2.ebuild

@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils

media-tv/kodi/kodi-17.0-r4.ebuild

@@ -27,10 +27,12 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
@@ -72,10 +74,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=net-misc/curl-7.51.0
 	nfs? ( net-fs/libnfs:= )
 	opengl? ( media-libs/glu )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
 	sftp? ( net-libs/libssh[sftp] )
@@ -84,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		media-video/ffmpeg[vdpau]
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
 	X? (
@@ -224,7 +224,7 @@ src_configure() {
 		-DENABLE_NONFREE=$(usex nonfree)
 		-DENABLE_OPENGLES=$(usex gles)
 		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=$(usex ssl)
+		-DENABLE_OPENSSL=ON
 		-DENABLE_OPTICAL=$(usex dvd)
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)

media-tv/kodi/kodi-17.1-r3.ebuild

@@ -12,10 +12,12 @@ inherit eutils linux-info python-single-r1 cmake-utils autotools
 LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
 LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
 LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.6"
 CODENAME="Krypton"
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
 
 DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
 HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
@@ -25,10 +27,12 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
@@ -65,15 +69,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libass-0.13.4
 	media-libs/mesa[egl]
 	>=media-libs/taglib-1.11.1
-	>=media-video/ffmpeg-3.1.6:=[encode,postproc]
+	system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
 	mysql? ( virtual/mysql )
 	>=net-misc/curl-7.51.0
 	nfs? ( net-fs/libnfs:= )
 	opengl? ( media-libs/glu )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
 	sftp? ( net-libs/libssh[sftp] )
@@ -82,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		media-video/ffmpeg[vdpau]
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
 	X? (
@@ -213,7 +215,7 @@ src_configure() {
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DVDCSS=$(usex css)
 		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_CAP=$(usex caps)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_MICROHTTPD=$(usex webserver)
@@ -222,7 +224,7 @@ src_configure() {
 		-DENABLE_NONFREE=$(usex nonfree)
 		-DENABLE_OPENGLES=$(usex gles)
 		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=$(usex ssl)
+		-DENABLE_OPENSSL=ON
 		-DENABLE_OPTICAL=$(usex dvd)
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
@@ -241,6 +243,8 @@ src_configure() {
 
 	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 
+	use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+
 	cmake-utils_src_configure
 }
 

media-tv/kodi/kodi-9999.ebuild

@@ -27,10 +27,12 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
+	gles? ( X )
+	opengl? ( X )
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
@@ -72,10 +74,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=net-misc/curl-7.51.0
 	nfs? ( net-fs/libnfs:= )
 	opengl? ( media-libs/glu )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	!libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+	libressl? ( dev-libs/libressl:0= )
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
 	sftp? ( net-libs/libssh[sftp] )
@@ -84,7 +84,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		media-video/ffmpeg[vdpau]
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
 	)
 	webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
 	X? (
@@ -223,7 +223,7 @@ src_configure() {
 		-DENABLE_NONFREE=$(usex nonfree)
 		-DENABLE_OPENGLES=$(usex gles)
 		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPENSSL=$(usex ssl)
+		-DENABLE_OPENSSL=ON
 		-DENABLE_OPTICAL=$(usex dvd)
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)

metadata/dtd/timestamp.chk

@@ -1 +1 @@
-Mon, 24 Apr 2017 05:09:15 +0000
+Mon, 24 Apr 2017 20:09:18 +0000

metadata/glsa/timestamp.chk

@@ -1 +1 @@
-Mon, 24 Apr 2017 05:09:15 +0000
+Mon, 24 Apr 2017 20:09:18 +0000

metadata/md5-cache/app-backup/bacula-7.4.7

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) virtual/pkgconfig >=app-portage/elt-patches-20170317
+DESCRIPTION=Featureful client/server network backup suite
+EAPI=5
+HOMEPAGE=http://www.bacula.org/
+IUSE=acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 libressl logwatch mysql postgres qt4 readline +sqlite ssl static tcpd vim-syntax X
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !bacula-nodir? ( virtual/mta ) ) qt4? ( dev-qt/qtsvg:4 x11-libs/qwt:5 ) logwatch? ( sys-apps/logwatch ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) sys-libs/zlib dev-libs/lzo sys-libs/ncurses:= ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) !bacula-clientonly? ( !bacula-nosd? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=|| ( ^^ ( mysql postgres sqlite ) bacula-clientonly ) static? ( bacula-clientonly )
+SLOT=0
+SRC_URI=mirror://sourceforge/bacula/bacula-7.4.7.tar.gz
+_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	qmake-utils	ea78a9056543346cdc8cbbd07f16c6fb	qt4-r2	b7985a3197fbc3a22d059f19904e735b	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=5eb4915da4b79a957d0a2335a388b2fd

metadata/md5-cache/app-emulation/vagrant-1.9.3

@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=app-arch/libarchive net-misc/curl virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) ) 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.1.5[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:0[ruby_targets_ruby21] dev-ruby/rest-client:2[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_ruby22? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby22] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby22] >=dev-ruby/i18n-0.6.0:*[ruby_targets_ruby22] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby22] >=dev-ruby/listen-3.1.5[ruby_targets_ruby22] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby22] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby22] <dev-ruby/log4r-1.1.11[ruby_targets_ruby22] >=dev-ruby/net-ssh-3.0.1:*[ruby_targets_ruby22] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby22] >=dev-ruby/net-scp-1.1.0[ruby_targets_ruby22] || ( >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby22] dev-ruby/rest-client:2[ruby_targets_ruby22] ) >=dev-ruby/nokogiri-1.6.7.1[ruby_targets_ruby22] >=dev-ruby/mime-types-2.6.2:*[ruby_targets_ruby22] <dev-ruby/mime-types-3:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/childprocess-0.5.0[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/i18n-0.6.0:*[ruby_targets_ruby23] <dev-ruby/i18n-0.8.0:*[ruby_targets_ruby23] >=dev-ruby/listen-3.1.5[ruby_targets_ruby23] >=dev-ruby/hashicorp-checkpoint-0.1.1[ruby_targets_ruby23] >=dev-ruby/log4r-1.1.9[ruby_targets_ruby23] <dev-ruby/log4r-1.1.11[ruby_targets_ruby23] >=dev-ruby/net-ssh-3.0.1:*[ruby_targets_ruby23] >=dev-ruby/net-sftp-2.1[ruby_targets_ruby23] >=dev-ruby/net-scp-1.1.0[ruby_targets_ruby23] || ( >=dev-ruby/rest-client-1.6.0:0[ruby_targets_ruby23] dev-ruby/rest-client:2[ruby_targets_ruby23] ) >=dev-ruby/nokogiri-1.6.7.1[ruby_targets_ruby23] >=dev-ruby/mime-types-2.6.2:*[ruby_targets_ruby23] <dev-ruby/mime-types-3:*[ruby_targets_ruby23] ) 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_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_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
-SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.9.1.tar.gz -> vagrant-1.9.1.tar.gz
+SRC_URI=https://github.com/mitchellh/vagrant/archive/v1.9.3.tar.gz -> vagrant-1.9.3.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=617568e8aa5747440d85225b55e3751e
+_md5_=e95a6ad029aebc6e12ced4241f66d9e3

metadata/md5-cache/app-misc/recoll-1.22.4

@@ -4,11 +4,11 @@ DESCRIPTION=A personal full text search package
 EAPI=6
 HOMEPAGE=http://www.lesbonscomptes.com/recoll/
 IUSE=camelcase doc +inotify qt4 qt5 session +spell python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:= sys-libs/zlib virtual/libiconv qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE ) ) spell? ( app-text/aspell ) 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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-arch/unzip sys-apps/sed virtual/awk
 REQUIRED_USE=session? ( inotify ) python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.22.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	qmake-utils	ea78a9056543346cdc8cbbd07f16c6fb	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e9eabc920d5b388b7150b6487b3958b9
+_md5_=fabe2cf5969d3ebe6f2d9246989e315d

metadata/md5-cache/app-shells/bash-completion-2.5

@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare test
+DEPEND=app-arch/xz-utils
+DESCRIPTION=Programmable Completion for bash
+EAPI=6
+HOMEPAGE=https://github.com/scop/bash-completion
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+LICENSE=GPL-2
+PDEPEND=>=app-shells/gentoo-bashcomp-20140911
+RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
+SLOT=0
+SRC_URI=https://github.com/scop/bash-completion/releases/download/2.5/bash-completion-2.5.tar.xz https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=50687892d595a8439d50c50e7998f402

metadata/md5-cache/app-text/nfoview-1.15.1

@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/pygobject:3 python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=sys-apps/sed-4
+DEPEND=dev-python/pygobject:3 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
 DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
 EAPI=5
 HOMEPAGE=http://home.gna.org/nfoview/
-IUSE=python_targets_python3_4
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
+RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.gna.org/nfoview/1.15/nfoview-1.15.1.tar.xz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	fdo-mime	21ef5adf81836863efa968f2a25cff64	gnome2-utils	6d2af8c7ab84825693c3f065a37b923c	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=9e4ebcc4be02deaea8ea26e678cb53cc
+_md5_=a5524406554004ae219c03e4c4a0c817

metadata/md5-cache/app-text/nfoview-9999

@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject:3 python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=sys-apps/sed-4 dev-vcs/git
+DEPEND=dev-python/pygobject:3 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 dev-vcs/git
 DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
 EAPI=5
 HOMEPAGE=http://home.gna.org/nfoview/
-IUSE=python_targets_python3_4
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
+RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	fdo-mime	21ef5adf81836863efa968f2a25cff64	git-2	195a672bfaf52d868442171c9469bbb6	gnome2-utils	6d2af8c7ab84825693c3f065a37b923c	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=19874653d4479532197f16ee2c137a63
+_md5_=2dad5ef7f4daa7dac941daf01f565da3

metadata/md5-cache/app-text/pastebinit-1.5

@@ -3,12 +3,12 @@ DEPEND=app-text/docbook-xsl-stylesheets
 DESCRIPTION=A software that lets you send anything you want directly to a pastebin
 EAPI=5
 HOMEPAGE=https://launchpad.net/pastebinit
-IUSE=crypt python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
+IUSE=crypt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] crypt? ( app-crypt/gnupg )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] crypt? ( app-crypt/gnupg )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/pastebinit/trunk/1.5/+download/pastebinit-1.5.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=48db0d9ac452db38c9c1d9c778c44254
+_md5_=e537b4da2e30506105fb958428e406c2

metadata/md5-cache/app-text/wklej-0.2.1-r1

@@ -1,14 +1,14 @@
 DEFINED_PHASES=install setup
-DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_pypy3(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?]
+DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),python_single_target_pypy(+)?,python_single_target_pypy3(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
 DESCRIPTION=A wklej.org submitter
 EAPI=5
 HOMEPAGE=http://wklej.org
-IUSE=+vim python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_single_target_pypy python_single_target_pypy3 python_single_target_python2_7 python_single_target_python3_4
+IUSE=+vim python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy python_single_target_pypy3 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_pypy3(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] vim? ( app-editors/vim[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_pypy3 python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) vim? ( ^^ ( python_single_target_python2_7 ) )
+RDEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),python_single_target_pypy(+)?,python_single_target_pypy3(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] vim? ( app-editors/vim[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_pypy3 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) vim? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://wklej.org/m/apps/wklej-0.2.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	python-single-r1	c3e54dd0dc1e70c6252f2551a55bf053	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=ceafe6d2a15c6f8730f32ccb61a25b50
+_md5_=be238682224854c65b59db28e76bd04c

metadata/md5-cache/app-text/xlsx2csv-0.7.2

@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl 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(-)]
+DEPEND=dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Convert MS Office xlsx files to CSV
 EAPI=5
 HOMEPAGE=https://github.com/dilshod/xlsx2csv/
-IUSE=python_targets_python2_7 python_targets_python3_4
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=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 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.2.tar.gz
 _eclasses_=distutils-r1	039ba10839816478cfb070fdeb053906	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=dcf1e7fcc17cbf718fcc0082e749a39c
+_md5_=2854e17aac0367938fad4786164c9b0a