Sync with portage [Wed Jan 11 21:43:19 MSK 2017].

2017-01-11 21:43:19 +03:00 · 2017-01-11 21:43:19 +03:00 · 8043c5635b
commit 8043c5635b
parent 211d2396f1
78 changed files with 823 additions and 366 deletions
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~mips ~x86 ~x86-fbsd"
 IUSE=""

 RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@ -1,3 +1,3 @@
-DIST auctex-11.87.tar.gz 1206073 SHA256 63d57229e585dbf727f5545337615b997488bfdf475274da0718c90b77bd5cf2 SHA512 41a575a36ef2c111f214ad2e87a06c246751859a14ad3f8af77aaf180d8357a4c8d44c2f344b673404d2e011cdf4a193abda93f1b26ffff663f310ed430c5fa1 WHIRLPOOL d3bee56c1b940a2eb041a5b3b6e5ffe876b740e97c5793dd9295b42723abb5febd1fc40d9a0007df5d63f00547a5a59202eca2c102dfb878924ac07dac504eb0
 DIST auctex-11.88.tar.gz 1302836 SHA256 716867d5fbcc5c67cca781d7c1984e6a3a6d5da056ec3b4f35170805bf4dc83f SHA512 30c422b52b3fc698e453ada9643038dd30978f6b1a99f5118a53ae5b939d63246adcb1937f0e5c4cf166477dca78fa17d721402a90c833c9e91d75072ae0f67d WHIRLPOOL fa348913637bf6062184873f50c6988aa1afdd7e4a456acfb139d704de9769480503e796716a632e9769f7d3f68d70e6e42a739ae8742857fcf6390baec156d6
 DIST auctex-11.89.tar.gz 1332904 SHA256 98af296907b371083289a8b35bd6ff24cfd8fafb013033b724aacb5fe774c9b1 SHA512 a78ddefb46c1eb271646f3c4e723f49a913e391eb58263df3d3de272bc1ad5b70c0a9de682f28124aa5a48b36c030b3e83425667ee1a1973a054ff03ef1d8be9 WHIRLPOOL 6d8614961ddf95c764ac5f4dc8ce63bc265ddf2b8a33ee827594930b6239217f8818fffa4b30a204f8c2cf16d127c3ae97bd8d24421ce1f5254deb3f833e9e8a
+DIST auctex-11.90.tar.gz 1437331 SHA256 3c232fd8e57780edea28cd3035afcc2b6ed965b5954e96b34a258cacfcaaf18f SHA512 b90b246a6193570897102d8f95396b35c8b899fc594446f2455469b9c58ca8fd1dafbb852c6f167fd8500261f007c8a66531bb04582d7a5c4a50a15933b70c83 WHIRLPOOL a8f42017cfa80ec3b21127068338f89526e584ea3cce0a92214fb40386fa82d4465f9514da62fc55edefa7ff3914d5dd5ee77d0cf7e4b0cecf93716f5f94f2f6
--- a/app-emacs/auctex/auctex-11.87-r1.ebuild
+++ b/app-emacs/auctex/auctex-11.87-r1.ebuild
@ -1,18 +1,18 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit elisp latex-package
+inherit elisp

-DESCRIPTION="Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files"
+DESCRIPTION="Extended support for (La)TeX, Texinfo and BibTeX files"
 HOMEPAGE="https://www.gnu.org/software/auctex/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="preview-latex"

 DEPEND="virtual/latex-base
@ -22,13 +22,8 @@ DEPEND="virtual/latex-base
 	)"
 RDEPEND="${DEPEND}"

-ELISP_PATCHES="${P}-jit-lock.patch"
 TEXMF="/usr/share/texmf-site"

-src_prepare() {
-	elisp_src_prepare
-}
-
 src_configure() {
 	EMACS_NAME=emacs EMACS_FLAVOR=emacs econf --disable-build-dir-test \
 		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
@ -47,20 +42,19 @@ src_compile() {

 src_install() {
 	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
 	if use preview-latex; then
-		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el" || die
+		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
 	fi
-	dodoc ChangeLog CHANGES FAQ INSTALL README RELEASE TODO
+	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
 }

 pkg_postinst() {
-	# rebuild TeX-inputfiles-database
-	use preview-latex && latex-package_pkg_postinst
+	use preview-latex && texmf-update
 	elisp-site-regen
 }

 pkg_postrm(){
-	use preview-latex && latex-package_pkg_postrm
+	use preview-latex && texmf-update
 	elisp-site-regen
 }
--- a/app-emacs/auctex/files/auctex-11.87-jit-lock.patch
+++ b/app-emacs/auctex/files/auctex-11.87-jit-lock.patch
@ -1,31 +0,0 @@
-commit 5b5ef6eeb0468c273a329a05d31b3788fd46b5d7
-Author: Mosè Giordano <giordano.mose@libero.it>
-Date:   Sun May 12 12:01:37 2013 +0200
-
-    Temporary fix for font-latex-jit-lock-force-redisplay.
-    
-    * font-latex.el (font-latex-jit-lock-force-redisplay): Don't rely
-    on existing `jit-lock-force-redisplay' because recent bzr Emacs
-    broke compatibility changing the number of arguments.  Reported by
-    Robert Goldman.
-
--- auctex-11.87-orig/font-latex.el
-+++ auctex-11.87/font-latex.el
-@@ -1220,8 +1220,6 @@
- 
- (defun font-latex-jit-lock-force-redisplay (buf start end)
-   "Compatibility for Emacsen not offering `jit-lock-force-redisplay'."
-  (if (fboundp 'jit-lock-force-redisplay)
-      (jit-lock-force-redisplay buf start end)
-     ;; The following block is an expansion of `jit-lock-force-redisplay'
-     ;; and involved macros taken from CVS Emacs on 2007-04-28.
-     (with-current-buffer buf
-@@ -1236,7 +1234,7 @@
- 		  buffer-file-truename)
- 	      (put-text-property start end 'fontified t))
- 	  (unless modified
-	    (restore-buffer-modified-p nil)))))))
-+	    (restore-buffer-modified-p nil))))))
- 
- (defun font-latex-fontify-region (beg end &optional loudly)
-   "Fontify region from BEG to END.
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@ -1 +1,2 @@
 DIST thefuck-3.11.tar.gz 796095 SHA256 77ee25d0da7c3b5e373c2811c3a4d625de4c635094e960b9f9c60dc490650213 SHA512 774041c5bb54457add90ed071555a0f6215f43501e9ad359af4e1525df34daa3d35de17ccc93f0c74985c107560c0f86e2db52d58265c4f78d31c69015359631 WHIRLPOOL 5eaf7e56100f601146ffd19090463c132ec66a9fcf71340979094df04d8179ddc6624a3c420c114c330e7fafcfbcaeebc1bca462382368a289b75d606f581698
+DIST thefuck-3.14.tar.gz 801989 SHA256 5757d7ba05ead08e867ab6b41e34d6f27fe38d5bb8af1ffc097aeed5ccc9c72f SHA512 b6963e4ab6de7c98bf324498f8f4ac2049a038bf50a856dcfe14570fa6351c9eba3ce9b9f30745ae37578750f8978003875682ffecefdc29e7baeee36d2fba3a WHIRLPOOL 795ba476b615d7b1de02c7e86679782af68fb698c31aae6115d380c330a5e0c43c5226a3a5af48ba9d3371ac14726ce1450437a8969bc109bf72f84e18f7f9d8
--- a/app-shells/thefuck/thefuck-3.14.ebuild
+++ b/app-shells/thefuck/thefuck-3.14.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+
+DESCRIPTION="Magnificent app which corrects your previous console command"
+HOMEPAGE="https://github.com/nvbn/thefuck"
+SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test || die
+}
--- a/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild
+++ b/dev-cpp/gccxml/gccxml-0.9.0_pre20131217.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.xz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"

 src_prepare() {
 	# fix bug 549300 by restoring pre-GCC5 inline semantics
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@ -1,6 +1,3 @@
 DIST phpMyAdmin-4.0.10.18-all-languages.tar.xz 4769668 SHA256 7c57c21ccb0d913bdd6ee1d57cfd9887204e1be8546595c5957b7d475c59b6d7 SHA512 f81cf0d952ec9777189072f490e9e1409610353bb29355772890f7f5681fd80da771c546d1109a59068fc120a3408f0d0a6101f6d57724e67cd40b9d648d47be WHIRLPOOL 16d557cf3a0d57f8e36f288a1be50632348b552decf866b6b7abf76203ecdc1839559820ba6550309b31b37cbce4e5774185348be1210f00ca235648de85042b
-DIST phpMyAdmin-4.4.15.5-all-languages.tar.xz 5783216 SHA256 6160724fa90ef5cccb67ad897a83586be28e64f5d6acf9bcb3313bc3d7638d8c SHA512 987d95f8352f58d7081aead10ccc7494b054d4041e0cb7454633e885c3217a7c63778d45c2dbf399e82c76159ab6651efeaf9c3cabc96982de83d5a041065e7a WHIRLPOOL b5fb8365817d1521f9e6ad5c60fa1a1ee941fb77062d63975d9f340c4abc681948fb6cd240c4943714d855f6f113baf46241bacf4d421b78f8f740c8bd9ade73
-DIST phpMyAdmin-4.4.15.8-all-languages.tar.xz 5772212 SHA256 aaabba81185da6496eef10eb2ee3fcb47138494bb50ca57a4050ca5a732a67a1 SHA512 4f417d8d371975133b76a9b4c4a4e6d31089281e68c9e0df33107c0d343b8d25ebb03f13ed6327a6024283b3de01dc623e080277acbffa41b46a87d00476c23c WHIRLPOOL 3046b629ecaacd843b130871af38561ac9b0aecbf4a80ceb3ee6b7f5491abf3ae39755ce038b6dcbb53ac0e8145ca3d01bda3b9fd001d5fe46990d805c16ed4e
-DIST phpMyAdmin-4.4.15.9-all-languages.tar.xz 5776028 SHA256 0d279bd34e542d3cdf5cb37667cc4617f008f39b5eb7d943e9aa739a2ceca174 SHA512 2dd5a9fcc777627b9bccad340e4e0d7b7736a6e088a9ce5957f7fc22cef909b4c81467dab359b7b597be7977fac08e4632e6f06fd6743f133a14773de6dda05c WHIRLPOOL 3f4597799165bc8773cc279ea5d036fd3036d1019762a3503d68ce28c5efdee9b83864d0bd4f6d4d466c90d71b78ed478cc53084fab84a811e6888208d3decaa
 DIST phpMyAdmin-4.6.5.1-all-languages.tar.xz 6162164 SHA256 e163b08b6d1137fd7c48ea97e8e53be415b1937f5e5f7e070936a60c3b9a3df0 SHA512 e6f90af32b77785ff49d9be4033e29e5b64df84d1a37dbe214df9049ef25ecfaee8e443aa9b789c408993541ea85c8e670b350071bd7f3437711462e164afad8 WHIRLPOOL 7e4f5d8e214192c33700b321343510f23f772c5c1a322749c2aded037be9b5743899fd67965743c5498615ae4cf73d0d2d5954ddd11c71b63724e2225ab3f200
 DIST phpMyAdmin-4.6.5.2-all-languages.tar.xz 6136880 SHA256 8cb549c0cd04ecaa3b2a8d9315e7c88528603fa6fe91057b13173f6afba80894 SHA512 10fecd5f313b3685b3d4d7c86b20e9466abc54298267f2ed41cf81096fae5bf8472860ac3ebd5ecba8644b43f69eaf944625a8a12beaba637bcefba0940f3a11 WHIRLPOOL e9de7fcbc50c0b3ea37f7e2dee1290340abd23211248285b36513459dc8c761a95be47a41698de34a4728afd653d87aa214367d162fef820f6a73413ff1ccf9b
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.8.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.9.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.9.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
--- a/dev-games/simgear/simgear-2016.4.4.ebuild
+++ b/dev-games/simgear/simgear-2016.4.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ HOMEPAGE="http://www.simgear.org/"
 SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SLOT="0"
 IUSE="+dns debug subversion test"

--- a/dev-perl/ZMQ-LibZMQ3/ZMQ-LibZMQ3-1.19.0.ebuild
+++ b/dev-perl/ZMQ-LibZMQ3/ZMQ-LibZMQ3-1.19.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A libzmq 3.x wrapper for Perl"

 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="test"

 DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"

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

 RDEPEND=">=sys-apps/util-linux-2.20"
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"

 COMMON_DEPEND="
--- a/dev-util/rustfmt/Manifest
+++ b/dev-util/rustfmt/Manifest
@ -1,24 +1,42 @@
 DIST aho-corasick-0.5.1.crate 29015 SHA256 67077478f0a03952bed2e6786338d400d40c25e9836e08ad50af96607317fd03 SHA512 81dbcf720613671880c5f28066a1368ee7e953c5d9f44253dc1f9c31b601e87bac518baa48cfaa34b905a4f687ec30233c1dcb00da093dbe502ce8a2f96b9619 WHIRLPOOL 33ddea81b7768c02a14d4a461b0f8e0175567ffbf70dc0aa849bbd46830df0607212c2c5d51efa1b3902ad156b20f22c14fa07be2d03b848a202b66579639d54
+DIST aho-corasick-0.5.3.crate 252052 SHA256 ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31 WHIRLPOOL 93651414398a02de849aa0b1dd8319678e20df385643422da751e38388afe60ae305f197a68cf2b9d1d6e39ef56c54979b6290a2c82555eb811839acffb72531
 DIST bitflags-0.5.0.crate 10940 SHA256 4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23 SHA512 220511ed57391bbbd4c8828cf485aed25d078a1cad6305367939072383e48468d545550002398a288d30d8501b9232fb9a91e7a3651f67103991677b9f25de0c WHIRLPOOL b2f567584f039de09c214eda79307a8e88c454a6e11e545abb100171947ec876b0573e0422c22d320c713750cccaba990518915fa6318656f6a3ac5fbf193bbe
+DIST bitflags-0.7.0.crate 10851 SHA256 aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0 WHIRLPOOL 60551486cd6688c78ecd0ac40ca39b1f3d75537dd96ec32e9882e205bfe2062de939a129777d66f8c269c8a71e2f2aa240e015c0b3bfa51adbad478024e296d4
 DIST diff-0.1.9.crate 2954 SHA256 e48977eec6d3b7707462c2dc2e1363ad91b5dd822cf942537ccdc2085dc87587 SHA512 d208be8da107d438168197c7ea67377048519b350c10d30410b57d71954ef634d03dfdb87b88f5a9fd7e0527ac31d165df95bf7a040b03c161831b9bb3f78dee WHIRLPOOL fdf5e092d43de67799e116f67e1f2b4c6014e93cd85e495f04be44f908b1ffea6e45a63bbebafc69fc61e93056526f53273f347a11d909578ff2f0f8991b33f0
 DIST env_logger-0.3.3.crate 5603 SHA256 aba65b63ffcc17ffacd6cf5aa843da7c5a25e3bd4bbe0b7def8b214e411250e5 SHA512 336384348b052e5af4f1b8be2930e124b35b4652c4c6fdf4861012092b81790da51776c6fea1d2667bcca65d0e0a27186ceee7aba6657a45551dfbc37a348b48 WHIRLPOOL 26a2cf3dd76a17e98939498e56255d5d14eb89705a7b8912fff2288e62cd2836b0e3d00f37a452a3583cad1aa991f16f0040968c7b856e509a23dac4ce2b488a
+DIST env_logger-0.3.5.crate 5950 SHA256 15abd780e45b3ea4f76b4e9a26ff4843258dd8a3eed2775a0e7368c2e7936c2f SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181 WHIRLPOOL 21b4c81d96e5a8ccbda8491df42db9144acf41f4a25b1f510d8af7d46c931a28e089615692d46d9eb73c511a9cacfb59a15a5647ed1eea6d17ef9a973d99f5a5
 DIST getopts-0.2.14.crate 16622 SHA256 d9047cfbd08a437050b363d35ef160452c5fe8ea5187ae0a624708c91581d685 SHA512 bb6101403b6d4ed6102dc84c69e95114c0f336924a3f45643a5a92ca82a2ad5ef6b0405e1975b84853831dcb7518b24d094a211a54cc2b46d32ff914e2f977bd WHIRLPOOL 43b3a9bb5dadb22ee63731003dadf0baef31b85dc70d22f16fca6d3059e40a426a249b1748793c8667655efc9dc7b1f05c6679368d4f4320f918b088af1965d6
+DIST itertools-0.4.19.crate 64212 SHA256 c4a9b56eb56058f43dc66e58f40a214b2ccbc9f3df51861b63d51dec7b65bc3f SHA512 3cc1ec3928ace76394572a92f28d883a11f6f6481a0efcfbb9ef73b30e7f1f0ea35c407639dc45feb83da16bb756faa10192c75aea0cbfe573c22e20a5d97c99 WHIRLPOOL 28ca8bb6fd5e7f0a80c45f472862c5913223ec4f5480b3420b3c63274b472a33b439d4ae86258e5d8e7fffc0e77a912779066cc521b587ee2d3dcb4cc9c4407d
 DIST kernel32-sys-0.2.1.crate 24530 SHA256 b5b5e7edf375e6d26243bde172f1d5ed1446f4a766fc9b7006e1fd27258243f1 SHA512 7d63fda3200fc565853e5c2733f06c97f48f94ddfb13db73f889197917478948c3f73b61a9c0efc42cd4f8a4355af4c1790e3145ea18f35ccf29a2be997f5bad WHIRLPOOL 80af653642291337ba9a3d581f8c98f042f26c6138e650a563eae8b7e41064934c565dab2b50b55e93482cb0567a14ae2fd46bb89beda528675e59ba47bdf7c5
+DIST kernel32-sys-0.2.2.crate 24537 SHA256 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b WHIRLPOOL 036baa6611f13d76692a5c032e7e8e8b5a82e12bdf13d5a2cdcf4d33020b003c941331f0c8aa774e7f7cc7b36ad7403bb2cbdecb739d7645cff66aeecd59b09f
+DIST libc-0.2.16.crate 104182 SHA256 408014cace30ee0f767b1c4517980646a573ec61a57957aeeabcac8ac0a02e8d SHA512 7af473d11ad4a34e9bfbd1dddf77d3d39773f76d779a60664458fbe0acecc871286ab41d90beb0ac5ae7285099ed1ff0c94ca69f5cbac4d3b2cb56b0ff766203 WHIRLPOOL 0f88147e5a880563d6950b0da897f0282cd171dea3719a8ed02a0ad76c1c1f1d8c15777db61b209e390a7c226817961acc705a4c967a9772aa9b7b0211726332
 DIST libc-0.2.9.crate 77923 SHA256 95ca44454e7cfe7f8a2095a41a10c79d96a177c0b1672cbf1a30d901a9c16ee5 SHA512 4c0c7d1a28f42ad9c7ac8a12171a6d5d747b174ad3637497ea0db79f3b72469f811f2f6fb8dbbc6aee8d9e04637a9de7d8888db766b15a35b428c986d2650a16 WHIRLPOOL 956a7a182edf78907cc6b32a0fe2c8cfd8d627d5b833bab9e17ec9458ef9d7829a66a6070176ec7ec7da8d058a6b2bdd242d2165a2ff779290a376bf15c1a05c
 DIST log-0.3.6.crate 16110 SHA256 ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054 SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174 WHIRLPOOL 18ef70829fae28a19e545479f4fd6f181d5dbd67ea17dadfa5b8ecdb8437c04f07036de5c2d5421bec4f783ba9b6390e833d624506bdbe99d1b0c47624082bab
 DIST memchr-0.1.11.crate 6977 SHA256 d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20 SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab WHIRLPOOL af0984d7e8084cc1aef94e486506a0fad9ec81d7be505233343e9fdad2ef0627a4d33bf99c2923959f9604326713ea24a01e2581aaa91249574b6c6d1a6d01a3
 DIST mempool-0.3.1.crate 6678 SHA256 4163a9c003e88a1d8d1ebe0a64101f66213f23735de6797ef91d136162e95594 SHA512 79c6d1891b6d8c6b8d2e6ec76b3ce49a4595fe5d4d21320c004657c6db37d0ef56d7caf6a7e113a1ad8332fa5be333aaa54e7a7ba88ea59c6ccb971e7043ef03 WHIRLPOOL c68bbd7bd64d97c2d4888db68d218d284d2c445a3e7fae503c55be51f333bc252bc7a9caafbbe5fd9b7c1d1a9195523149c2a2aeb9ed8a6ae9a61fdc91367f24
+DIST multimap-0.3.0.crate 10681 SHA256 9223f4774d08e06185e44e555b9a7561243d387bac49c78a6205c42d6975fbf2 SHA512 ba1c8c4f9f23da2b80b5a16668b8227d1147aa9999f3b11343deb3e4b0582ead6fd957b7d0cb18f4b8141df3e6c8b81aa7f6c2ee0d0d61868b4e00181f5f290e WHIRLPOOL 36b63f994500979723699b9237d0335963517fad93621b52544453188be5cc18df6788a42b2cd9fc5b2b09fbda81d7c36a419d3ada564084790b9fcca24bf538
 DIST regex-0.1.63.crate 276618 SHA256 0452ff4986fadf8eff4c7165ebbab51fe51a42e7fc6fa337eee2fbe58b70eb03 SHA512 1758fc37f60e64a44bdaee66af84e9f5126c694186cf17612da7ff9b828261cb5136ea34a14e0a160cc7de2aa211f8fa806e3d27762e3aba8d0f4e0ba8c4e13d WHIRLPOOL 528440f6cd6bb211a8f570a758c1e698edf8463e05bb2c306e486172a527c1234d3a3864db0a3f384a450281a0a72bbc1cb7cd8e5996f898b9c19698c9d512f0
+DIST regex-0.1.77.crate 185559 SHA256 64b03446c466d35b42f2a8b203c8e03ed8b91c0f17b56e1f84f7210a257aa665 SHA512 6b63a8d51a79ff020f6256d319d86e0a4a5efbf56071877ff4f23bb283c5a92ae914b6d7a00e4ac85c1b0efd45f68dd3672356e86a63343cd3ee6be1a206bfea WHIRLPOOL 065627433da57be33beb4641514c45138c31c2b729c154ac02002415ddf3751814ecf7f13149b793f1fb8d2757585ff003c85b5a2a2ff0f3a4d0b00034f965ee
 DIST regex-syntax-0.3.1.crate 115911 SHA256 841591b1e05609a643e3b4d0045fce04f701daba7151ddcd3ad47b080693d5a9 SHA512 ed040291d3c9e195923134fae7cf436752578c9bf975b48e3a426009ea5a71eb3852441036726781172f2006dc450801b12f6dc0cba31e60d7ed4fa8e85dd721 WHIRLPOOL e676a41c26794f1a49bd86b3bf844b62d254412c6fa3879eff97a896c62cb8db5dd90d3642f48a64941ad42611e7246f033ab9c50d06a00b08f1e0d0eb2948bc
+DIST regex-syntax-0.3.5.crate 116666 SHA256 279401017ae31cf4e15344aa3f085d0e2e5c1e70067289ef906906fdbe92c8fd SHA512 df3757a583b546af275937264788d04fb212d13fbce84b4200e88f10aa38558cf098ec7f91b838c09905ae2b71a8984566b71ef9f9b6e74d9404f3e5a4c027fc WHIRLPOOL 05e22047118cb679c7ba968e69ed4cd3e7293a0ddbb73e3a36b6b3eb44deeac429299d10caf81b0f6a9e58563417ba9e1adcfb24d46064f075cd5510f4c2a7e4
 DIST rustc-serialize-0.3.19.crate 40870 SHA256 6159e4e6e559c81bd706afe9c8fd68f547d3e851ce12e76b1de7914bab61691b SHA512 265f6426287e532822ba4ab7e209b0a0ba0fd58466f292c38b554ea12c7a992ad1a1910e10d151eedf1f0c99c248c64cdc4d4609cb67e36472e425d315f8a83e WHIRLPOOL 154e73db1b26bf65eef86b7f66aeae6def77a19e05d8786b89d74ae73ffac7e7d994e94572061a68cd07f01ed362d4320de901850aa8f089046a6165b4aa7fd6
 DIST rustfmt-0.5.0.crate 77624 SHA256 c2d860213f6e653527de316bdd9bf4fa821cc3c3b052540885a26653e7a77288 SHA512 228a68ba7d2c12483635506d2564edae3203848fd00020554993ffdad3d160be78ffb917564553f0eaafe2862c53316447dc131269cf14abeec9714a137d8fed WHIRLPOOL 59467598b6b9747be5d775b194ca3cee097c72d1e695d68536f67b46e8b907084383afe65629477b5b7e9762180104af9cb3cc8857f53808a10bfdbd77126608
+DIST rustfmt-0.6.3.crate 88474 SHA256 21a36236a22925a6057ea1025152584bc750a61051cf5f885cb5299788d76f17 SHA512 d2b12ae9cb78af43029363d97dcd5e0bbbc4f1eaf96d738b06d2c13662b20b9e4ca975056ccb683be3e52099307431da9e31db452f2f355b825bb1bd83b12f80 WHIRLPOOL 32e4fe767c25a193f0c8f48b3f09950c6dc841e066eae96420b0c04087442d503a54f0fee0d5fda433cb4240a48d87e6f9a222dc604835fb49e94edb3b65c7d4
 DIST strings-0.0.1.crate 12981 SHA256 54f86446ab480b4f60782188f4f78886465c5793aee248cbb48b7fdc0d022420 SHA512 be94151f46962ce4980d225af4bd007cd3bd56e630e361078b119796ae34566db97e8f35ae82e6bcef299fb79cd3101570eff25914dd9b4b410ea133ec0938a9 WHIRLPOOL b3018af3c0eb2220884ea68be7826ca7438fc306c27d9f8400e6bea5be5a0c2a00f8a427d75d2731b0884c6af328b9f732c713f928b92b6202b27a7f22fd4a1e
+DIST syntex_errors-0.44.0.crate 17411 SHA256 d0d95d2141ae79f312a01c6934d9984f9d7f5cfaf0c74aae5fbbc234a6dcb77a SHA512 25a4f8580e253b10fa08953b34e66d6ddbe85cbc9f872b8343e739b8a8c754b823ae7c948de9678c2f3bef58bf54bfe35fda63b0eaf7f5d5e935143f531d166d WHIRLPOOL d73248a7969b4617d280fb0c0c80371c23b64dc72013a0e77e41f587fdb02340bb67a88733fc9c1c371f67178d3b29a7f00aa3d3cb087d29ca7b524ca3ef774e
+DIST syntex_pos-0.44.0.crate 6883 SHA256 3e2cbf0598c5970f2dca122a4e6f7e93bf42f2d0b2dd88c3ea112413152864df SHA512 856a3103446afa42b615668c74ca073af55c03e8d1e3043ea120889aa9e18f284fb43a8982aa9bec4eb6bddc272e8ff45a26a8570dff1777c945185ae500a280 WHIRLPOOL 8355e8e4aef1b3a9e09e0bd4be5ba2f89eab0a5b606b7a1e677afdf47cd8d5fd392896e8cd02a5e20fc3b79edc0334bef167fef966a6601e5f5f9c27fb737583
 DIST syntex_syntax-0.32.0.crate 663466 SHA256 86169b0992bf734955f1a3bb07e8ac9851506b1337d7d1f7c5537084f4e6efd5 SHA512 28059e6c68dc1324c0fb4411f829ad6a25fdb4573e15be5021206fb519b1a4d350129a073d279c7bf785308becfced5ecbdb7a60eb6ca78eada0111b5480d61b WHIRLPOOL 4236f466c18d8310f297797a70d97fdd8e10c87f1f647693bcd8f5ba01343e7ee4526092abc3dca75b141c192ee7cd2be47e5b1f23b0bc9cb9c1c3ca1f8e15bf
+DIST syntex_syntax-0.44.1.crate 257816 SHA256 5a89ee386d492cdd3855becec489c25797bb91bcbb3c2478c41969b24cb318a2 SHA512 4d26e2a207efefc42993fd2e707a7b16882dfcf91e6d3ad385e210c3e2e9dafb3686e5a508ec27dd5acbf7bcf8edbf53d891cfb925b782691fc5d4243ecb376f WHIRLPOOL 3022e205c19e3cf0f95d6fb393089b87f096b9381e4969c9d5ba221313bbe8c48e921d748e2b187f6fc032db6c4c2c62612f7ab8ec859cc9e7bbab79a620173c
 DIST term-0.2.14.crate 25395 SHA256 f2077e54d38055cf1ca0fd7933a2e00cd3ec8f6fed352b2a377f06dcdaaf3281 SHA512 34872c1c1b06afb79ed3ac8a92d9c145681d22c09a3f1f5dd6047dfcc177ad5b1b9c9201ec982009e9f85d7ea71bac26d1f317fecfc67d2cd7569aa52c3327ed WHIRLPOOL 7a77e568ff67d47f7280cf4fcac4775f001d185325cf5559c342eac8ce882b2cae947d819b702f22a6e5d5b9f5cb21c8342004c5509dc9d1718ff0c592a8809d
 DIST term-0.4.4.crate 35853 SHA256 3deff8a2b3b6607d6d7cc32ac25c0b33709453ca9cceac006caac51e963cf94a SHA512 df99c7273ca6f97ec3d9206f98601540d26370124a7a5404cc072bf2e6621bc48fa74101e60f29bea10869278401193648e253fc2029f4cf8e3c8303625b11f7 WHIRLPOOL 57de8f4d686d6806fd18a3de9ead347d2c4c8b63af5175d3c2df4e894ffe13b62caa93774bd320e3d2c42108849012071bce8c07414856af8374884661bd164a
+DIST thread-id-2.0.0.crate 6108 SHA256 a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03 SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0 WHIRLPOOL 88a26709bb3a6b27ab102e4414d25f20361ad92be89662c59c14ceed8a84eb17249ece8f250fb082e85acb75835ea81d1f5b62358e57e1bb1bfb96dac5d6e1f4
+DIST thread_local-0.2.7.crate 10954 SHA256 8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35 WHIRLPOOL 5988b0a217254ee39387b34dcadd9f44243a2403fabb33b3ce56415910b27e0ff887ec209af1f25e40ed4f3646e840a903f156c5546b20b640aa44463adca44b
 DIST toml-0.1.28.crate 42323 SHA256 fcd27a04ca509aff336ba5eb2abc58d456f52c4ff64d9724d88acb85ead560b6 SHA512 4b4af8fa2f9079259e2c4ebddde70e82f96603c4ec69a266394366671a5c42c61a6ea13fd51145a97c286ca48cbe731650065fac1c20822f818aff48f2a2b13c WHIRLPOOL 7746b110241648466382a1e73ccf7569ed996f49270e2552443f7ff23bbe4bae3fc22e87513239828387efb1ba984220957dabe6b70bbaee14463a38cbea6d75
+DIST toml-0.1.30.crate 45082 SHA256 0590d72182e50e879c4da3b11c6488dae18fccb1ae0c7a3eda18e16795844796 SHA512 e6d06f47750fea66705f7b7e34c396665c564dc7687a9d1ff5f56bb63f37aaa991c253a022f76aa8857e9b95dcb0c11d0246889df98d4c8aca34ba7e1fb97ae7 WHIRLPOOL 54546e97c4fd2054cd96787d504dffc752be7d139f119cf4cdcdd4141ce86f6cc7af21eefdb72743a919a6e848b6432e3d33e2bf7d46c92b7438596dd28e41d1
 DIST unicode-segmentation-0.1.2.crate 53030 SHA256 b905d0fc2a1f0befd86b0e72e31d1787944efef9d38b9358a9e92a69757f7e3b SHA512 bdc196b56b7776fba44ed068823752fd48b962fbf9fa64fc3b976ab6ef3bced449b9f76c2fa5ab5c91294253b697871c1fc66a9ea6b95f087fadd1ee047bddd9 WHIRLPOOL e89ed0a1e36fe8e059479cb575fa5a17063eebb37cc5412663d45da7cf8484a941fb08c6981169ac32cdbffec424ca66c13790f9565339ae96411ded57472bf4
 DIST unicode-xid-0.0.3.crate 15998 SHA256 36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb SHA512 268c1f3ec79ed2255c4e3759e4526b4892cb04f54ced07afbfff0ff8dcdec953e5b540fcb58b30bfec01b6401b58ef3b21320a0c1bf3a43aec22f0715568dcc5 WHIRLPOOL 6e11d1a02e8f03c7490e644b112a64b8ececa1e05e7fe39bdf63c540f17d5d5d676de775bf8c6a69efdbc926c3584a69a727ecbcffea34dbb608e36a8bbdb261
 DIST utf8-ranges-0.1.3.crate 8422 SHA256 a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374 WHIRLPOOL 05b6f88e1ba81a2139d38d0feb60781976859adfc46731ef322a552b17db71e0bf61c6626432812fb2e0ca45ce10a5438d9dcf218a962ef7415187adaa0280fa
+DIST walkdir-0.1.8.crate 19807 SHA256 c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780 SHA512 292602f33d0eec44529f9fd763a76420177d7a3a417645975053871823b6531691cb0c253bc8ead2c32cd061538c161701aa86b111148960417e2d5e198b0d0f WHIRLPOOL e0eed883b20badd26366ce755021f91230dc75b8c8b607cc1eec085d6dbd56b7cbf9f8dfc7d101c15bf9ad8d36d3c574d18ee250722ab733d7a70fcc840e082f
 DIST winapi-0.2.6.crate 741153 SHA256 4dfaaa8fbdaa618fa6914b59b2769d690dd7521920a18d84b42d254678dd5fd4 SHA512 ee81295e8154b0656b2ec892a38c69b3e1f839d6915ff68439ab5fe9ef9cf2d85cdadc9e8c9779d0eb3046821cafbc1f6e7977057178c85b29a21a86781bcc38 WHIRLPOOL 60e95e757262cab7eb8dc2fbefbf6ecb9578ce77a5841a7221eedf78b42a4faa0ce4a56c2a35726a85fa8105b84464468cb23b9c855853f9e777b69e601c66cb
+DIST winapi-0.2.8.crate 455145 SHA256 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe WHIRLPOOL 3dce71a6927320e3882ba60a24630a9ba8d123b73d8da6b9330e422580af9d9b0a96748d7368767e3712185877ddec6978b924d40428341c4de19b76ed375af4
 DIST winapi-build-0.1.1.crate 669 SHA256 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 WHIRLPOOL 036080513776fe806cc9dd68bbf5b797776b98ca9fdceaa4bd77c87c66d2e5bd0eec8b0e7f0100dab8f2ced754da058f67e651002c786b4992c2be416a5d52ff
--- a/dev-util/rustfmt/rustfmt-0.6.3.ebuild
+++ b/dev-util/rustfmt/rustfmt-0.6.3.ebuild
@ -0,0 +1,49 @@
+# Auto-Generated by cargo-ebuild 0.1.3
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.5.3
+bitflags-0.7.0
+diff-0.1.9
+env_logger-0.3.5
+getopts-0.2.14
+itertools-0.4.19
+kernel32-sys-0.2.2
+libc-0.2.16
+log-0.3.6
+memchr-0.1.11
+multimap-0.3.0
+regex-0.1.77
+regex-syntax-0.3.5
+rustc-serialize-0.3.19
+rustfmt-0.6.3
+strings-0.0.1
+syntex_errors-0.44.0
+syntex_pos-0.44.0
+syntex_syntax-0.44.1
+term-0.4.4
+thread-id-2.0.0
+thread_local-0.2.7
+toml-0.1.30
+unicode-segmentation-0.1.2
+unicode-xid-0.0.3
+utf8-ranges-0.1.3
+walkdir-0.1.8
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="Tool to find and fix Rust formatting issues"
+HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+RESTRICT="mirror"
+LICENSE="Apache-2.0/MIT" # Update to proper Gentoo format
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
--- a/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2016.4.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"

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

 # data files split to separate package since 2.10.0
--- a/games-simulation/flightgear/flightgear-2016.4.4.ebuild
+++ b/games-simulation/flightgear/flightgear-2016.4.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="dbus debug examples qt5 test +udev +utils vim-syntax"

 COMMON_DEPEND="
@ -23,6 +23,7 @@ COMMON_DEPEND="
 	media-libs/speex
 	media-sound/gsm
 	sys-libs/zlib
+	virtual/glu
 	x11-libs/libX11
 	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
 	qt5? (
@ -40,6 +41,7 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.44
 	>=media-libs/plib-1.8.5
+	utils? ( x11-libs/libXmu )
 "
 RDEPEND="${COMMON_DEPEND}
 	~games-simulation/${PN}-data-${PV}
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes

 LICENSE="GPL-2 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc64 ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"

 DEPEND=">=sys-apps/sed-4
--- a/media-sound/toolame/toolame-02l-r4.ebuild
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""

 PATCHES=(
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 13:43:09 +0000
+Wed, 11 Jan 2017 18:13:25 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 13:43:09 +0000
+Wed, 11 Jan 2017 18:13:25 +0000
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.2
@ -4,11 +4,11 @@ DESCRIPTION=Remove outdated built kernels
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/eclean-kernel/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~mips ~x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/eclean-kernel/downloads/eclean-kernel-0.4.2.tar.bz2
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0107a01f809513a88578ae189172f540
+_md5_=39ff011f5d0f0f018e37176c5bcb8159
--- a/metadata/md5-cache/app-emacs/auctex-11.87-r1
+++ b/metadata/md5-cache/app-emacs/auctex-11.87-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23 virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=Extended support for writing, formatting and using (La)TeX, Texinfo and BibTeX files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/auctex/
-IUSE=preview-latex
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3+ FDL-1.3+
-RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gnu/auctex/auctex-11.87.tar.gz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	017377e73405d964cd0137088cddb9c3	latex-package	58e25573cc86e53dddea91261009b301	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=cecbb173c4313fed91d6ae9cc775bade
--- a/metadata/md5-cache/app-emacs/auctex-11.90
+++ b/metadata/md5-cache/app-emacs/auctex-11.90
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
+DESCRIPTION=Extended support for (La)TeX, Texinfo and BibTeX files
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/auctex/
+IUSE=preview-latex
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-3+ FDL-1.3+
+RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://gnu/auctex/auctex-11.90.tar.gz
+_eclasses_=elisp	7e36316fe822639d5a29fa10d5529eb9	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74
+_md5_=4932a3ad4e7ae17bdc05f206c8535590
--- a/metadata/md5-cache/app-shells/thefuck-3.14
+++ b/metadata/md5-cache/app-shells/thefuck-3.14
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Magnificent app which corrects your previous console command
+EAPI=5
+HOMEPAGE=https://github.com/nvbn/thefuck
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/colorama[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/nvbn/thefuck/archive/3.14.tar.gz -> thefuck-3.14.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=8fb165f401b78fb0cc4dd948b59a4b85
--- a/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217
+++ b/metadata/md5-cache/dev-cpp/gccxml-0.9.0_pre20131217
@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.5.2
 DESCRIPTION=XML output extension to GCC
 EAPI=6
 HOMEPAGE=http://www.gccxml.org/
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/gccxml-0.9.0_pre20131217.tar.xz
 _eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8d6b1763822979144dd56ac37151fa39
+_md5_=42a7e80baf12b29220c90f46a44a81b0
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.5
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.5
@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.4.15.5
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.4.15.5/phpMyAdmin-4.4.15.5-all-languages.tar.xz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=d31e4e485b0d4dadbe989f71ad428cf1
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.8
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.8
@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.4.15.8
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.4.15.8/phpMyAdmin-4.4.15.8-all-languages.tar.xz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=be81625ff270dad457e2675b585519a0
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.9
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.9
@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.4.15.9
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.4.15.9/phpMyAdmin-4.4.15.9-all-languages.tar.xz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=238abe9536297a7348fd66cfa2828ab7
--- a/metadata/md5-cache/dev-games/simgear-2016.4.4
+++ b/metadata/md5-cache/dev-games/simgear-2016.4.4
@ -4,10 +4,10 @@ DESCRIPTION=Development library for simulation games
 EAPI=6
 HOMEPAGE=http://www.simgear.org/
 IUSE=+dns debug subversion test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-games/openscenegraph-3.2.0 media-libs/openal net-misc/curl sys-libs/zlib virtual/opengl dns? ( net-libs/udns ) subversion? ( dev-vcs/subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2016.4.4.tar.bz2
 _eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=283d0dad27557c125765b4dc42f453a3
+_md5_=b647935b12a8462e4b7daf5ff0cf5569
--- a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ3-1.19.0
+++ b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ3-1.19.0
@ -4,10 +4,10 @@ DESCRIPTION=A libzmq 3.x wrapper for Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ZMQ-LibZMQ3/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND==net-libs/zeromq-3* dev-perl/ZMQ-Constants virtual/perl-XSLoader dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-LibZMQ3-1.19.tar.gz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=2b1da40ecbbfcb5ebca36bb4d59dcf11
+_md5_=8dca31674d56ce95f43e5335f57b8184
--- a/metadata/md5-cache/dev-python/bottle-0.12.12
+++ b/metadata/md5-cache/dev-python/bottle-0.12.12
@ -4,11 +4,11 @@ DESCRIPTION=A fast and simple micro-framework for small web-applications
 EAPI=5
 HOMEPAGE=https://pypi.python.org/pypi/bottle http://bottlepy.org/
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.12.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3a6eff10fb5296b0a7b57817cffc5fc9
+_md5_=af1f5d9d50650c8543fba75759e2734d
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.2
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.2
@ -4,11 +4,11 @@ DESCRIPTION=Python extension module to (re)mount /boot
 EAPI=5
 HOMEPAGE=https://bitbucket.org/mgorny/pymountboot/
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sys-apps/util-linux-2.20 python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/mgorny/pymountboot/downloads/pymountboot-0.2.2.tar.bz2
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0bf76a16871e60474cf795aa9dafdc04
+_md5_=852459e694ac3e41915005e09501c519
--- a/metadata/md5-cache/dev-util/ctags-20161028
+++ b/metadata/md5-cache/dev-util/ctags-20161028
@ -4,9 +4,9 @@ DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=6
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IUSE=json xml yaml
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=json? ( dev-libs/jansson ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/vim/ctags-20161028.tar.xz
-_md5_=c4bb21c7c9f6fece74dc075c08afccdc
+_md5_=1713c3cd0b0db2acc1831d9abbd368b4
--- a/metadata/md5-cache/dev-util/rustfmt-0.6.3
+++ b/metadata/md5-cache/dev-util/rustfmt-0.6.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-util/cargo-0.13.0
+DESCRIPTION=Tool to find and fix Rust formatting issues
+EAPI=6
+HOMEPAGE=https://github.com/rust-lang-nursery/rustfmt
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0/MIT
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.5.3/download -> aho-corasick-0.5.3.crate https://crates.io/api/v1/crates/bitflags/0.7.0/download -> bitflags-0.7.0.crate https://crates.io/api/v1/crates/diff/0.1.9/download -> diff-0.1.9.crate https://crates.io/api/v1/crates/env_logger/0.3.5/download -> env_logger-0.3.5.crate https://crates.io/api/v1/crates/getopts/0.2.14/download -> getopts-0.2.14.crate https://crates.io/api/v1/crates/itertools/0.4.19/download -> itertools-0.4.19.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/libc/0.2.16/download -> libc-0.2.16.crate https://crates.io/api/v1/crates/log/0.3.6/download -> log-0.3.6.crate https://crates.io/api/v1/crates/memchr/0.1.11/download -> memchr-0.1.11.crate https://crates.io/api/v1/crates/multimap/0.3.0/download -> multimap-0.3.0.crate https://crates.io/api/v1/crates/regex/0.1.77/download -> regex-0.1.77.crate https://crates.io/api/v1/crates/regex-syntax/0.3.5/download -> regex-syntax-0.3.5.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.19/download -> rustc-serialize-0.3.19.crate https://crates.io/api/v1/crates/rustfmt/0.6.3/download -> rustfmt-0.6.3.crate https://crates.io/api/v1/crates/strings/0.0.1/download -> strings-0.0.1.crate https://crates.io/api/v1/crates/syntex_errors/0.44.0/download -> syntex_errors-0.44.0.crate https://crates.io/api/v1/crates/syntex_pos/0.44.0/download -> syntex_pos-0.44.0.crate https://crates.io/api/v1/crates/syntex_syntax/0.44.1/download -> syntex_syntax-0.44.1.crate https://crates.io/api/v1/crates/term/0.4.4/download -> term-0.4.4.crate https://crates.io/api/v1/crates/thread-id/2.0.0/download -> thread-id-2.0.0.crate https://crates.io/api/v1/crates/thread_local/0.2.7/download -> thread_local-0.2.7.crate https://crates.io/api/v1/crates/toml/0.1.30/download -> toml-0.1.30.crate https://crates.io/api/v1/crates/unicode-segmentation/0.1.2/download -> unicode-segmentation-0.1.2.crate https://crates.io/api/v1/crates/unicode-xid/0.0.3/download -> unicode-xid-0.0.3.crate https://crates.io/api/v1/crates/utf8-ranges/0.1.3/download -> utf8-ranges-0.1.3.crate https://crates.io/api/v1/crates/walkdir/0.1.8/download -> walkdir-0.1.8.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate
+_eclasses_=cargo	ffa40d249354cbebd1cc0e99f0ff962a
+_md5_=a30a9fd38d7c25a7090a18189295290c
--- a/metadata/md5-cache/games-simulation/flightgear-2016.4.4
+++ b/metadata/md5-cache/games-simulation/flightgear-2016.4.4
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.4.4 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 sys-devel/make >=dev-util/cmake-3.5.2
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.4.4 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.5.2
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
 IUSE=dbus debug examples qt5 test +udev +utils vim-syntax
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.4.4 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) ~games-simulation/flightgear-data-2016.4.4
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[png] ~dev-games/simgear-2016.4.4 media-libs/openal media-libs/speex media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) qt5? ( >=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtwidgets-5.4.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/libpng:0 virtual/opengl ) ~games-simulation/flightgear-data-2016.4.4
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2016.4.4.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8b0b7710afc43aa93fffeeb512736b89
+_md5_=cd428c4c003635646c0dee9b1e8ca769
--- a/metadata/md5-cache/games-simulation/flightgear-data-2016.4.4
+++ b/metadata/md5-cache/games-simulation/flightgear-data-2016.4.4
@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=FlightGear data files
 EAPI=6
 HOMEPAGE=http://www.flightgear.org/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!<games-simulation/flightgear-2.10.0
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/FlightGear-2016.4.4-data.tar.bz2
-_md5_=d544284b1c07a95c7af468874af3cc37
+_md5_=fb0b1c869e4fcdaf6326cf157ac638dc
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r3
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.0-r3
@ -4,10 +4,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers
 EAPI=6
 HOMEPAGE=http://www.ijs.si/software/amavisd/
 IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc64 ~x86
 LICENSE=GPL-2 BSD-2
 RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
 SLOT=0
 SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.11.0.tar.xz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=333579475620a9c8272a2dae411ed1a9
+_md5_=9d8f873330e8197e3756c85c1b677c08
--- a/metadata/md5-cache/media-sound/toolame-02l-r4
+++ b/metadata/md5-cache/media-sound/toolame-02l-r4
@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=tooLAME - an optimized mpeg 1/2 layer 2 audio encoder
 EAPI=6
 HOMEPAGE=http://www.planckenergy.com
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/toolame/toolame-02l.tgz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=929ab5db3bd804b56801bcbc42e704ae
+_md5_=c9674be5315b138a75365be17fe51d62
--- a/metadata/md5-cache/sci-biology/mira-4.0.2
+++ b/metadata/md5-cache/sci-biology/mira-4.0.2
@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/boost[threads] dev-util/google-perftools <sys-devel/flex-2.6.0 app-editors/vim-core dev-libs/expat !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/boost[threads] dev-util/google-perftools sys-devel/flex app-editors/vim-core dev-libs/expat !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Illumina
 EAPI=5
 HOMEPAGE=http://www.chevreux.org/projects_mira.html
@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost[threads] dev-util/google-perftools
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/mira-assembler/files/MIRA/stable/mira-4.0.2.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_06-07-2012.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1b2c4e0b3d28d376d63014314a1e52f1
+_md5_=f05a734d85c9183f99fcdbcb62290268
--- a/metadata/md5-cache/sci-geosciences/qgis-2.18.2-r3
+++ b/metadata/md5-cache/sci-geosciences/qgis-2.18.2-r3
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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_python2_7(+)] dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,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_python2_7(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 x11-libs/qscintilla:=[qt4(-)] || ( ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) ) georeferencer? ( sci-libs/gsl:= ) grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= ) postgres? ( dev-db/postgresql:= ) python? ( dev-python/PyQt4[X,sql,svg,webkit,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_python2_7(+)] <dev-python/sip-4.19:=[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_python2_7(+)] dev-python/qscintilla-python[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_python2_7(+)] dev-python/python-dateutil[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_python2_7(+)] dev-python/httplib2[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_python2_7(+)] dev-python/jinja[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_python2_7(+)] dev-python/markupsafe[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_python2_7(+)] dev-python/pygments[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_python2_7(+)] dev-python/pytz[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_python2_7(+)] dev-python/requests[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_python2_7(+)] dev-python/six[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_python2_7(+)] postgres? ( dev-python/psycopg: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_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-db/sqlite:3 >=dev-db/spatialite-4.1.0 app-crypt/qca:2[qt4,ssl] sys-devel/bison sys-devel/flex >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=User friendly Geographic Information System
+EAPI=6
+HOMEPAGE=http://www.qgis.org/
+IUSE=examples georeferencer grass mapserver oracle postgres python python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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_python2_7(+)] dev-libs/expat sci-geosciences/gpsbabel >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,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_python2_7(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj dev-libs/qjson dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 dev-qt/qtsvg:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 x11-libs/qscintilla:=[qt4(-)] || ( ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 ) ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 ) ) georeferencer? ( sci-libs/gsl:= ) grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= ) postgres? ( dev-db/postgresql:= ) python? ( dev-python/PyQt4[X,sql,svg,webkit,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_python2_7(+)] <dev-python/sip-4.19:=[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_python2_7(+)] dev-python/qscintilla-python[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_python2_7(+)] dev-python/python-dateutil[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_python2_7(+)] dev-python/httplib2[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_python2_7(+)] dev-python/jinja[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_python2_7(+)] dev-python/markupsafe[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_python2_7(+)] dev-python/pygments[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_python2_7(+)] dev-python/pytz[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_python2_7(+)] dev-python/requests[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_python2_7(+)] dev-python/six[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_python2_7(+)] postgres? ( dev-python/psycopg: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_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) dev-db/sqlite:3 >=dev-db/spatialite-4.1.0 app-crypt/qca:2[qt4,ssl]
+REQUIRED_USE=python? ( python_targets_python2_7 ) mapserver? ( python )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://qgis.org/downloads/qgis-2.18.2.tar.bz2 examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )
+_eclasses_=cmake-utils	fa4d8052a1ccf4fbbfa76361bffebe42	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7c491e503abd96d4d348a15b2230930a
--- a/metadata/md5-cache/sci-visualization/veusz-1.25.1
+++ b/metadata/md5-cache/sci-visualization/veusz-1.25.1
@ -4,11 +4,11 @@ DESCRIPTION=Qt scientific plotting package with good Postscript output
 EAPI=5
 HOMEPAGE=http://home.gna.org/veusz/
 IUSE=dbus doc emf fits hdf5 minuit vo python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/PyQt4-4.11.4[compat,X,svg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) minuit? ( dev-python/pyminuit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) vo? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sampy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=http://download.gna.org/veusz/veusz-1.25.1.tar.gz
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6e44c740d138c36dae8382af637f9c33
+_md5_=267a6324e2c5cb6960cb8109f532d907
--- a/metadata/md5-cache/sec-policy/apparmor-profiles-2.11.0
+++ b/metadata/md5-cache/sec-policy/apparmor-profiles-2.11.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=A collection of profiles for the AppArmor application security system
+EAPI=6
+HOMEPAGE=http://apparmor.net/
+IUSE=minimal
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a331c33248244aab30bfd5a859385536
--- a/metadata/md5-cache/sys-apps/apparmor-2.11.0
+++ b/metadata/md5-cache/sys-apps/apparmor-2.11.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=~sys-libs/libapparmor-2.11.0 dev-lang/perl sys-devel/bison sys-devel/flex doc? ( dev-tex/latex2html )
+DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
+EAPI=6
+HOMEPAGE=http://apparmor.net/
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=~sys-libs/libapparmor-2.11.0
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8ce1e7b88085cf3a50acab1b8c58616a
--- a/metadata/md5-cache/sys-apps/apparmor-utils-2.11.0
+++ b/metadata/md5-cache/sys-apps/apparmor-utils-2.11.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-lang/perl:=
+DESCRIPTION=Additional userspace utils to assist with AppArmor profile management
+EAPI=6
+HOMEPAGE=http://apparmor.net/
+IUSE=python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ~sys-libs/libapparmor-2.11.0[perl,python] ~sys-apps/apparmor-2.11.0 dev-perl/Locale-gettext dev-perl/RPC-XML dev-perl/TermReadKey virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-lang/perl:=
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3cc8d00ad06a3d53bf75aa19ab2884fd
--- a/metadata/md5-cache/sys-apps/systemd-231
+++ b/metadata/md5-cache/sys-apps/systemd-231
@ -12,4 +12,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz !doc? ( https://dev.gentoo.org/~floppym/dist/systemd-231-man.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b71f78686cd1839f5c6e8cfac6d0e485
+_md5_=4d0816784f56e6fa8f8911c3d8520dff
--- a/metadata/md5-cache/sys-libs/libapparmor-2.11.0
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.11.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Library to support AppArmor userspace utilities
+EAPI=5
+HOMEPAGE=http://apparmor.net/
+IUSE=doc +perl +python static-libs python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=591bb1b05bb05c2d157df58396e0a9fc
--- a/metadata/md5-cache/www-apps/gitea-1.0.1
+++ b/metadata/md5-cache/www-apps/gitea-1.0.1
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-go/go-bindata >=dev-lang/go-1.4.2:=
+DESCRIPTION=A painless self-hosted Git service, written in Go
+EAPI=6
+HOMEPAGE=https://github.com/go-gitea/gitea
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/archive/6aacf4d2f09631359b99df562b4bf31dcef44ea3.tar.gz -> gitea-1.0.1.tar.gz
+_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a	user	80aaa71614ced86f02ee1a513821dc87
+_md5_=e2013bbf6a56c672c646fe5250326180
--- a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0
@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
 EAPI=5
 HOMEPAGE=http://xcb.freedesktop.org/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://github.com/Airblader/xcb-util-xrm/releases/download/v1.0/xcb-util-xrm-1.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	1639ccc38d3b68fcb9211b7d8d96c02a
-_md5_=d93f2bb2cbe0714d5aa7ffe9a5231d20
+_md5_=daded4c33301c0188eb1fd06a1d47411
--- a/metadata/md5-cache/x11-plugins/wmifs-1.8
+++ b/metadata/md5-cache/x11-plugins/wmifs-1.8
@ -3,9 +3,9 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXpm
 DESCRIPTION=Network monitoring dockapp
 EAPI=6
 HOMEPAGE=http://www.dockapps.net/wmtime
-KEYWORDS=~alpha ~amd64 ~mips ~ppc sparc ~x86
+KEYWORDS=~alpha amd64 ~mips ~ppc sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmifs-1.8.tar.gz
-_md5_=6642d1f86f48bd9aacc265dc6e9cda74
+_md5_=f6104be09a0feba8761cb2b3f8e2c0f4
--- a/metadata/md5-cache/x11-plugins/wmppp-1.3.2-r1
+++ b/metadata/md5-cache/x11-plugins/wmppp-1.3.2-r1
@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/lib
 DESCRIPTION=PPP dial control and network load monitor with NeXTStep look
 EAPI=5
 HOMEPAGE=http://www.dockapps.net/wmppp.app
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libdockapp-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/wmppp.app-1.3.2.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=579c5ea50eba669bf8991ff00b36fdb1
+_md5_=99022bc44d6c95cdf6b945b2e9e0f6e7
--- a/metadata/md5-cache/x11-wm/i3-4.13-r1
+++ b/metadata/md5-cache/x11-wm/i3-4.13-r1
@ -4,10 +4,10 @@ DESCRIPTION=An improved dynamic tiling window manager
 EAPI=6
 HOMEPAGE=http://i3wm.org/
 IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm >=x11-libs/cairo-1.14.4[X,xcb] >=x11-libs/pango-1.30.0[X] dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 SLOT=0
 SRC_URI=http://i3wm.org/downloads/i3-4.13.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=338f79562511bc6c38240f5c3be95229
+_md5_=ce5fac484362e636c90ad697e679020b
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 13:43:09 +0000
+Wed, 11 Jan 2017 18:13:25 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Jan 11 13:39:24 UTC 2017
+Wed Jan 11 18:09:35 UTC 2017
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 14:00:01 +0000
+Wed, 11 Jan 2017 18:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1484142001 Wed 11 Jan 2017 01:40:01 PM UTC
+1484158201 Wed 11 Jan 2017 06:10:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 13:43:09 +0000
+Wed, 11 Jan 2017 18:13:25 +0000
--- a/sci-biology/mira/mira-4.0.2.ebuild
+++ b/sci-biology/mira/mira-4.0.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -28,7 +28,7 @@ CDEPEND="
 	dev-libs/boost[threads]
 	dev-util/google-perftools"
 DEPEND="${CDEPEND}
-	<sys-devel/flex-2.6.0
+	sys-devel/flex
 	app-editors/vim-core
 	dev-libs/expat"
 RDEPEND="${CDEPEND}"
@ -49,6 +49,17 @@ src_prepare() {
 		-i configure.ac || die

 	eautoreconf
+
+	# Remove C++ source files that were built with flex by upstream.
+	local f
+	local PREBUILT_CXX_LEXER_FILES=(
+		"$S"/src/io/exp_flexer.cc
+		"$S"/src/mira/parameters_flexer.cc
+	)
+
+	for f in "${PREBUILT_CXX_LEXER_FILES[@]}"; do
+		[[ -f $f ]] && { rm "$f" || die "Failed to remove $f"; } || die "$f not found"
+	done
 }

 src_configure() {
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
@ -0,0 +1,187 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils fdo-mime gnome2-utils cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+	http://qgis.org/downloads/qgis-${PV}.tar.bz2
+	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	mapserver? ( python )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/expat
+	sci-geosciences/gpsbabel
+	>=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	dev-libs/qjson
+	dev-qt/designer:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	x11-libs/qscintilla:=[qt4(-)]
+	|| (
+		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1 )
+		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
+	)
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
+	mapserver? ( dev-libs/fcgi )
+	oracle? ( dev-db/oracle-instantclient:= )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
+		<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		${PYTHON_DEPS}
+	)
+	dev-db/sqlite:3
+	>=dev-db/spatialite-4.1.0
+	app-crypt/qca:2[qt4,ssl]
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	cd src/plugins || die
+	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DWITH_INTERNAL_DATEUTIL=OFF
+		-DWITH_INTERNAL_HTTPLIB2=OFF
+		-DWITH_INTERNAL_JINJA2=OFF
+		-DWITH_INTERNAL_MARKUPSAFE=OFF
+		-DWITH_INTERNAL_PYGMENTS=OFF
+		-DWITH_INTERNAL_PYTZ=OFF
+		-DWITH_INTERNAL_QWTPOLAR=OFF
+		-DWITH_INTERNAL_SIX=OFF
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_BINDINGS="$(usex python)"
+		-DWITH_GRASS7="$(usex grass)"
+		$(usex grass "-DGRASS_PREFIX=/usr/" "")
+		-DWITH_ORACLE="$(usex oracle)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+		-DWITH_PYSPATIALITE="$(usex python)"
+		-DWITH_SERVER="$(usex mapserver)"
+	)
+
+	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
+		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
+		mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" )
+		if has_version '>=x11-libs/qwt-6.1.2' ; then
+			mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" )
+		else
+			mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" )
+		fi
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+	fi
+
+	python_optimize "${D}"/usr/share/qgis/python
+
+	if use grass; then
+		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
--- a/sci-visualization/veusz/veusz-1.25.1.ebuild
+++ b/sci-visualization/veusz/veusz-1.25.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dbus doc emf fits hdf5 minuit vo"

 CDEPEND="
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@ -1 +1,2 @@
 DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
+DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
--- a/sec-policy/apparmor-profiles/apparmor-profiles-2.11.0.ebuild
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-2.11.0.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abstractions,tunables}
+	else
+		default
+	fi
+}
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@ -1 +1,2 @@
 DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
+DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.0.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.11.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+inherit perl-module python-r1 versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}/utils
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-shebang.patch"
+)
+
+src_compile() {
+	python_setup
+
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+}
+
+src_install() {
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		"${PYTHON}" "${S}"/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --version="${PV}"
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+}
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@ -1 +1,2 @@
 DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
+DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
--- a/sys-apps/apparmor/apparmor-2.11.0.ebuild
+++ b/sys-apps/apparmor/apparmor-2.11.0.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-makefile.patch"
+	"${FILESDIR}/${PN}-2.10-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+}
+
+src_compile()  {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+	use doc && emake pdf
+}
+
+src_install() {
+	emake DESTDIR="${D}" USE_SYSTEM=1 install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}"/${PN}-init ${PN}
+
+	use doc && dodoc techdoc.pdf
+}
--- a/sys-apps/systemd/systemd-231.ebuild
+++ b/sys-apps/systemd/systemd-231.ebuild
@ -162,7 +162,8 @@ src_prepare() {
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die

 	local PATCHES=(
-		"${FILESDIR}/232-lz4-version.patch"
+		"${FILESDIR}"/232-0001-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch
+		"${FILESDIR}"/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
 		"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
 		"${FILESDIR}/228-noclean-tmp.patch"
 	)
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@ -1 +1,2 @@
 DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
+DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
--- a/sys-libs/libapparmor/libapparmor-2.11.0.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.11.0.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools-utils distutils-r1 perl-module versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +perl +python static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig	)"
+
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+src_prepare() {
+	rm -r m4 || die "failed to remove bundled macros"
+	epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
+	autotools-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with perl) \
+		$(use_with python)
+	)
+
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile -C src
+	autotools-utils_src_compile -C include
+	use doc && autotools-utils_src_compile -C doc
+	use perl && autotools-utils_src_compile -C swig/perl
+
+	if use python ; then
+		pushd "${BUILD_DIR}"/swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install -C src
+	autotools-utils_src_install -C include
+	use doc && autotools-utils_src_install -C doc
+
+	if use perl ; then
+		autotools-utils_src_install -C swig/perl
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
+	fi
+
+	if use python ; then
+		pushd "${BUILD_DIR}"/swig/python > /dev/null
+		distutils-r1_src_install
+
+		python_moduleinto LibAppArmor
+		python_foreach_impl python_domodule LibAppArmor.py
+		popd > /dev/null
+	fi
+}
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@ -1 +1,2 @@
 DIST gitea-1.0.0.tar.gz 13444004 SHA256 3ad67b91f44e0b60739c57f42c880276686347f76e5993f9d95b99ab4f67185c SHA512 5047256cd02a5592a41600abdcb10a3ffee42dda7bd9696d60e8a926f0846098a6686de941feefc52b4070ed9842a744a2f5765c8a1e6ea26d5a63cca2fa96a2 WHIRLPOOL 1cf2205ac0cbcccb56f32101218780c250ad947ad961fcfecc5ceb5be56446a554d5cb2852569ff88fbc218eddc4bac2efd9c392fc53b2830d900b7dd76c0e99
+DIST gitea-1.0.1.tar.gz 13444004 SHA256 3ad67b91f44e0b60739c57f42c880276686347f76e5993f9d95b99ab4f67185c SHA512 5047256cd02a5592a41600abdcb10a3ffee42dda7bd9696d60e8a926f0846098a6686de941feefc52b4070ed9842a744a2f5765c8a1e6ea26d5a63cca2fa96a2 WHIRLPOOL 1cf2205ac0cbcccb56f32101218780c250ad947ad961fcfecc5ceb5be56446a554d5cb2852569ff88fbc218eddc4bac2efd9c392fc53b2830d900b7dd76c0e99
--- a/www-apps/gitea/gitea-1.0.1.ebuild
+++ b/www-apps/gitea/gitea-1.0.1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="code.gitea.io/gitea/..."
+EGIT_COMMIT="6aacf4d2f09631359b99df562b4bf31dcef44ea3"
+ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm"
+
+DESCRIPTION="A painless self-hosted Git service, written in Go"
+HOMEPAGE="https://github.com/go-gitea/gitea"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata"
+RDEPEND="dev-vcs/git"
+
+pkg_setup() {
+	enewgroup git
+	enewuser git -1 /bin/bash /var/lib/gitea git
+}
+
+src_prepare() {
+	default
+	local GITEA_PREFIX=${EPREFIX}/var/lib/gitea
+	sed -i -e "s/git rev-parse --short HEAD/echo ${EGIT_COMMIT:0:7}/"\
+		-e "s/^LDFLAGS += -X \"main.Version.*$/LDFLAGS += -X \"main.Version=${PV}\"/"\
+		-e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN%/*}/Makefile || die
+	sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
+		-e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
+		-e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
+		-e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
+		-e "s#^TEMP_PATH = data/tmp/uploads#TEMP_PATH = ${GITEA_PREFIX}/data/tmp/uploads#"\
+		-e "s#^PATH = data/attachments#PATH = ${GITEA_PREFIX}/data/attachments#"\
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" src/${EGO_PN%/*}/conf/app.ini || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} generate
+	TAGS="bindata pam sqlite" LDFLAGS="" CGO_LDFLAGS="-fno-PIC" GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" emake -C src/${EGO_PN%/*} build
+}
+
+src_install() {
+	pushd src/${EGO_PN%/*} || die
+	dobin gitea
+	insinto /var/lib/gitea/conf
+	newins conf/app.ini app.ini.example
+	popd || die
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/gitea.logrotated gitea
+	newinitd "${FILESDIR}"/gitea.initd gitea
+	newconfd "${FILESDIR}"/gitea.confd gitea
+	keepdir /var/log/gitea /var/lib/gitea/data
+	fowners -R git:git /var/log/gitea /var/lib/gitea/
+}
+
+pkg_postinst() {
+	if [[ ! -e ${EROOT}/var/lib/gitea/conf/app.ini ]]; then
+		elog "No app.ini found, copying the example over"
+		cp ${EROOT}/var/lib/gitea/conf/app.ini{.example,} || die
+	else
+		elog "app.ini found, please check example file for possible changes"
+	fi
+}
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -13,7 +13,7 @@ DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"

-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"

 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
--- a/x11-plugins/wmifs/wmifs-1.8.ebuild
+++ b/x11-plugins/wmifs/wmifs-1.8.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc sparc ~x86"
+KEYWORDS="~alpha amd64 ~mips ~ppc sparc ~x86"
 IUSE=""

 RDEPEND=">=x11-libs/libdockapp-0.7:=
--- a/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
+++ b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"

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

 RDEPEND=">=x11-libs/libdockapp-0.7:=
--- a/x11-wm/i3/i3-4.13-r1.ebuild
+++ b/x11-wm/i3/i3-4.13-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"

 CDEPEND="dev-libs/libev