2017-12-25 19:46:51 UTC

author: Repository QA checks <repo-qa-checks@gentoo.org> 2017-12-25 19:46:57 +0000
committer: Repository QA checks <repo-qa-checks@gentoo.org> 2017-12-25 19:46:57 +0000
commit: e757887c1d03673f9de5992077685a8788ed5501 (patch)
tree: e3bd882cd50337d48768b2d5653db77e981c638e
parent: Merge updates from master (diff)
download: gentoo-e757887c1d03673f9de5992077685a8788ed5501.tar.gz
gentoo-e757887c1d03673f9de5992077685a8788ed5501.tar.bz2
gentoo-e757887c1d03673f9de5992077685a8788ed5501.zip
68 files changed, 156 insertions, 210 deletions
diff --git a/metadata/md5-cache/app-editors/sublime-text-2.0.2-r2 b/metadata/md5-cache/app-editors/sublime-text-2.0.2-r2
deleted file mode 100644
index 56f1543414c5..000000000000
--- a/metadata/md5-cache/app-editors/sublime-text-2.0.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Sophisticated text editor for code, markup and prose
-EAPI=6
-HOMEPAGE=http://www.sublimetext.com
-IUSE=dbus
-KEYWORDS=~amd64 ~x86
-LICENSE=Sublime
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dbus? ( sys-apps/dbus )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2 -> sublime-text-2.0.2_x64.tar.bz2 ) x86? ( https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2 -> sublime-text-2.0.2_x32.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af65c4830103e114eede608832d598ce
diff --git a/metadata/md5-cache/app-editors/sublime-text-3_pre3126-r3 b/metadata/md5-cache/app-editors/sublime-text-3_pre3126-r3
deleted file mode 100644
index a883246a6a5f..000000000000
--- a/metadata/md5-cache/app-editors/sublime-text-3_pre3126-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Sophisticated text editor for code, markup and prose
-EAPI=6
-HOMEPAGE=http://www.sublimetext.com
-IUSE=dbus
-KEYWORDS=~amd64 ~x86
-LICENSE=Sublime
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 dbus? ( sys-apps/dbus )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://download.sublimetext.com/sublime_text_3_build_3126_x64.tar.bz2 ) x86? ( https://download.sublimetext.com/sublime_text_3_build_3126_x32.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6805150e9a57bd75caeedaff618a2745
diff --git a/metadata/md5-cache/app-portage/gemato-9.2 b/metadata/md5-cache/app-portage/gemato-9.2
index b3ff8459e0d8..eec526918e1e 100644
--- a/metadata/md5-cache/app-portage/gemato-9.2
+++ b/metadata/md5-cache/app-portage/gemato-9.2
@@ -4,11 +4,11 @@ DESCRIPTION=Stand-alone Manifest generation & verification tool
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/gemato
 IUSE=+blake2 bzip2 +gpg lzma +portage-postsync sha3 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2
 RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] portage-postsync? ( app-crypt/gentoo-keys ) 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-9.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=807cf36d897ecbbdba095c09e97d5464
+_md5_=3fb00f1b9cb1466069ebf2acb0f1e027
diff --git a/metadata/md5-cache/app-text/nfoview-1.15.1 b/metadata/md5-cache/app-text/nfoview-1.15.1
index e53f24fe962a..c40ecc8f56e4 100644
--- a/metadata/md5-cache/app-text/nfoview-1.15.1
+++ b/metadata/md5-cache/app-text/nfoview-1.15.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/pygobject:3 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
 DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=5
+EAPI=6
 HOMEPAGE=http://home.gna.org/nfoview/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://download.gna.org/nfoview/1.15/nfoview-1.15.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a5524406554004ae219c03e4c4a0c817
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1e0c5467111db9e82e3c32fd7da3eee
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index bfd2dacff1f2..3f72f5a45161 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject:3 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 dev-vcs/git
+DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=5
+EAPI=6
 HOMEPAGE=http://home.gna.org/nfoview/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3 media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-2	195a672bfaf52d868442171c9469bbb6	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2dad5ef7f4daa7dac941daf01f565da3
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2124e69d53f6238b98cccfceb06ae587
diff --git a/metadata/md5-cache/app-text/unpaper-5.1 b/metadata/md5-cache/app-text/unpaper-5.1
deleted file mode 100644
index d2b22a573464..000000000000
--- a/metadata/md5-cache/app-text/unpaper-5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=test? ( media-libs/netpbm[png] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets
-DESCRIPTION=Post-processor for scanned and photocopied book pages
-EAPI=5
-HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://www.flameeyes.eu/files/unpaper-5.1.tar.xz
-_md5_=46b32075754f9067cf46476d11df3309
diff --git a/metadata/md5-cache/app-text/unpaper-6.1 b/metadata/md5-cache/app-text/unpaper-6.1
deleted file mode 100644
index 8de4335abf43..000000000000
--- a/metadata/md5-cache/app-text/unpaper-6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig || ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[encode] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Post-processor for scanned and photocopied book pages
-EAPI=5
-HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[encode] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.flameeyes.eu/files/unpaper-6.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bd9b684fa4844dfafa786f1f60065c41
diff --git a/metadata/md5-cache/app-text/unpaper-6.1-r1 b/metadata/md5-cache/app-text/unpaper-6.1-r1
index 93413f9262d9..bbe8beb65053 100644
--- a/metadata/md5-cache/app-text/unpaper-6.1-r1
+++ b/metadata/md5-cache/app-text/unpaper-6.1-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] ) >=app-portage/elt-patches-20170422
+DEFINED_PHASES=prepare
+DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] )
 DESCRIPTION=Post-processor for scanned and photocopied book pages
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
 IUSE=libav test
 KEYWORDS=~amd64 ~x86
@@ -10,5 +10,4 @@ RDEPEND=libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffm
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.flameeyes.eu/files/unpaper-6.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b40818a7b29ae648ae918c08c02ad511
+_md5_=162096926b6ce7f5e2a72f16c739cfd9
diff --git a/metadata/md5-cache/app-text/unpaper-9999 b/metadata/md5-cache/app-text/unpaper-9999
index 2261760fe5e8..ff748fef1466 100644
--- a/metadata/md5-cache/app-text/unpaper-9999
+++ b/metadata/md5-cache/app-text/unpaper-9999
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] ) >=app-portage/elt-patches-20170422 dev-vcs/git
+DEFINED_PHASES=prepare unpack
+DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] ) >=dev-vcs/git-1.8.2.1 >=app-portage/elt-patches-20170422 !<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=Post-processor for scanned and photocopied book pages
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
 IUSE=libav test
 LICENSE=GPL-2
 RDEPEND=libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b40818a7b29ae648ae918c08c02ad511
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=162096926b6ce7f5e2a72f16c739cfd9
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8 b/metadata/md5-cache/app-text/xournal-0.4.8
index 0ed646bb8766..720129f0c49a 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8
+++ b/metadata/md5-cache/app-text/xournal-0.4.8
@@ -10,4 +10,4 @@ RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnome
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad55691e6203970af145ff001270eaa5
+_md5_=0e6f6707f8a29a6b2287d38bf8bb206b
diff --git a/metadata/md5-cache/app-text/xournal-0.4.8-r1 b/metadata/md5-cache/app-text/xournal-0.4.8-r1
index d726777a521d..ae05d75f80e3 100644
--- a/metadata/md5-cache/app-text/xournal-0.4.8-r1
+++ b/metadata/md5-cache/app-text/xournal-0.4.8-r1
@@ -10,4 +10,4 @@ RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnome
 SLOT=0
 SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58b8ba4bff2ef783f52acd4403287a6d
+_md5_=c1b04d131c5506fd23552495b820a751
diff --git a/metadata/md5-cache/app-text/xournal-9999 b/metadata/md5-cache/app-text/xournal-9999
index 2cceea8f69ee..5a876ff3e958 100644
--- a/metadata/md5-cache/app-text/xournal-9999
+++ b/metadata/md5-cache/app-text/xournal-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-vcs/git !<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=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
 EAPI=5
 HOMEPAGE=http://xournal.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=+pdf
 LICENSE=GPL-2
 RDEPEND=app-text/poppler:=[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45b8cf959fdac8aca6322e9c44eda42b
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ff1701e490e48a99e5fc1ec8423b5179
diff --git a/metadata/md5-cache/app-text/zathura-0.2.9 b/metadata/md5-cache/app-text/zathura-0.2.9
index 5c32dfca9c59..ee5f6c03dc8d 100644
--- a/metadata/md5-cache/app-text/zathura-0.2.9
+++ b/metadata/md5-cache/app-text/zathura-0.2.9
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst postrm setup test
+DEFINED_PHASES=compile configure install postinst postrm test
 DEPEND=>=dev-libs/girara-0.2.2:3= >=dev-libs/glib-2.28:2= x11-libs/cairo:= >=x11-libs/gtk+-3.2:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=5
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.2.2:3= >=dev-libs/glib-2.28:2= x11-libs/cairo:= >=x11-libs/gtk+-3.2:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= )
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.2.9.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=769dc63e4ed880045b34ca559fde40b9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1e2552405ba7d54d968ba1bfdfbce303
diff --git a/metadata/md5-cache/app-text/zathura-0.3.7 b/metadata/md5-cache/app-text/zathura-0.3.7
index 2157a88152e9..ac5423c6525b 100644
--- a/metadata/md5-cache/app-text/zathura-0.3.7
+++ b/metadata/md5-cache/app-text/zathura-0.3.7
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=5
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.3.7.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=faf5d4f17e6ad8c94a03f1aa68c3a3a4
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=715e8a2205306fb36400601406467377
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index be3333e32a4c..00c5cb544cd1 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile install postinst postrm setup test unpack
-DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-vcs/git
+DEFINED_PHASES=compile configure install postinst postrm test unpack
+DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A highly customizable and functional document viewer
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
@@ -7,5 +7,5 @@ IUSE=+magic sqlite synctex test test
 LICENSE=ZLIB
 RDEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=d312415f68dc96205a6814ec4a2b1433
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	virtualx	171580f737f5aaf18fcb456548588066	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4cacf5402117e8be231f5fd755815b48
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.2 b/metadata/md5-cache/app-text/zathura-cb-0.1.2
index 43ea1bb225b6..40395b09e976 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.2
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=>=app-text/zathura-0.2.7 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/zathura-0.2.7 dev-libs/glib:2= app-arch/libarchive:= x11-libs
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e052be0c13f49c81f0ce644cc5789c42
+_md5_=b8e0697b1b76365cb6ab9b1c252e9551
diff --git a/metadata/md5-cache/app-text/zathura-cb-0.1.6 b/metadata/md5-cache/app-text/zathura-cb-0.1.6
index fc6ad71a4b92..643f37a70e5b 100644
--- a/metadata/md5-cache/app-text/zathura-cb-0.1.6
+++ b/metadata/md5-cache/app-text/zathura-cb-0.1.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install postinst setup
+DEFINED_PHASES=compile configure install postinst
 DEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:= virtual/pkgconfig
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b08ef145a842d8e72d8a1d21a463396b
+_md5_=741d209214f39ea9e43c7ad65675106a
diff --git a/metadata/md5-cache/app-text/zathura-cb-9999 b/metadata/md5-cache/app-text/zathura-cb-9999
index 6242615bcc89..ed23efbdb629 100644
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:= virtual/pkgconfig dev-vcs/git
+DEFINED_PHASES=compile configure install postinst unpack
+DEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fcf5ee28c90b8ad0cebdc074ed7ac382
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=8374116024fb3f798e4887b1dc253ad7
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.3 b/metadata/md5-cache/app-text/zathura-djvu-0.2.3
index 69cd47ced57d..4555ccecdf2a 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.3
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x1
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-0.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5362e106dbcfce34b29b43739d396091
+_md5_=8608ffe9a879b64ae05473739dc9cf9a
diff --git a/metadata/md5-cache/app-text/zathura-djvu-0.2.6 b/metadata/md5-cache/app-text/zathura-djvu-0.2.6
index 176c017cbd8b..9b6adb8d96dd 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-0.2.6
+++ b/metadata/md5-cache/app-text/zathura-djvu-0.2.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x1
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-0.2.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=32ccb060121ae6d4f86c5e45db13a5d5
+_md5_=f66a5feea566e211d4c1d06af56b9b15
diff --git a/metadata/md5-cache/app-text/zathura-djvu-9999 b/metadata/md5-cache/app-text/zathura-djvu-9999
index d96c067b21be..4c01c3502f0b 100644
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DEFINED_PHASES=compile configure install unpack
+DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=DjVu plug-in for zathura
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:=
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=086085eaedde4de5e3fbd7a474c679bb
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0ed81807a6b3ef4301256401072d3461
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.1 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.1
index 9a0730cdf31e..62b99ca5ac69 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.1
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= >=app-text/zathura-0.3.1 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= >=app-text/zathur
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2065dfc9ed4cf1dcd40cbde68f9579ac
+_md5_=8a030b190f93656ad76e8b8f9b712609
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
index 29a6a4d7a28a..4a87d404d7d4 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= >=app-text/zathura-0.3.1 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DEFINED_PHASES=compile configure install unpack
+DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= >=app-text/zathura-0.3.1 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= >=app-text/zathura-0.3.1 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:=
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=65f43ab2bcb873f1d747c857e2ce2490
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=fdb0d8e69e637180c99a3a9b80bfdfd1
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.5 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.5
index da5a7460f1f2..a4a601e9ca8f 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.5
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=e494674d36d172e7a70e4ff39560bff8
+_md5_=9b4e2951479e9bb00db31a55662311fe
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7 b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
index 8017a1f80705..c7226486e664 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-0.2.7
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=db5b14f2ecfa36dcba521c2de8f6b1f8
+_md5_=9b4e2951479e9bb00db31a55662311fe
diff --git a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999 b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
index 007058625eba..90c54b20568b 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DEFINED_PHASES=compile configure install unpack
+DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=3e93680b952c54f6f27fe4a2020d1b28
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=1bdf6f7b2fd6f59eb82a8b482b8c37fe
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.2 b/metadata/md5-cache/app-text/zathura-ps-0.2.2
index a424bca4fd42..4cd1cce7ce99 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.2
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a7dcef0c3fdeaa09946920540178cd43
+_md5_=1c46f5afa1054e1a31895b62412d0ce5
diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.4 b/metadata/md5-cache/app-text/zathura-ps-0.2.4
index 389cb3149128..66cddb5b1671 100644
--- a/metadata/md5-cache/app-text/zathura-ps-0.2.4
+++ b/metadata/md5-cache/app-text/zathura-ps-0.2.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install setup
+DEFINED_PHASES=compile configure install
 DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2=
 SLOT=0
 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8322c1a1bc799cb3bc38918ddaea23e5
+_md5_=1c46f5afa1054e1a31895b62412d0ce5
diff --git a/metadata/md5-cache/app-text/zathura-ps-9999 b/metadata/md5-cache/app-text/zathura-ps-9999
index b74cc01278b9..2b8ae6a7591c 100644
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DEFINED_PHASES=compile configure install unpack
+DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=PostScript plug-in for zathura
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
 LICENSE=ZLIB
 RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:=
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c387600feefc00efc6797b508cd7f226
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=956f3cf2f28c2375d4ee4003863e0363
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-20090310 b/metadata/md5-cache/app-vim/exheres-syntax-20090310
index 23f7ce6dfaa4..edb8f3a9708a 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-20090310
+++ b/metadata/md5-cache/app-vim/exheres-syntax-20090310
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: exheres format highlighting
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.exherbo.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
@@ -9,4 +9,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=http://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=775c1ec97226885be55365f62b17fda2
+_md5_=265d66dc37cf157794768e4217a1a6f8
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index 213dc1020284..5572b789aa56 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) dev-vcs/git
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: exheres format highlighting
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.exherbo.org/
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-2	195a672bfaf52d868442171c9469bbb6	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=803faea135747074be759366f6900683
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=3c325aebcc92c0af88dd128fa8aae813
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.7 b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.7
index e105a668ecc0..3cf3ea78e526 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.7
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.7
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.13.0.7/aerospike-server-community-3.13.0.7-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17d793a8b1cd4d41a326432dcb6714be
+_md5_=365fb8bcb4ef5f094b0f9add076de301
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.8 b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.8
index cc0e317c9ddb..49f9e8ce9317 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.8
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.13.0.8/aerospike-server-community-3.13.0.8-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17d793a8b1cd4d41a326432dcb6714be
+_md5_=365fb8bcb4ef5f094b0f9add076de301
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.4 b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.4
index f7d79e688021..5e9d4a0844a1 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.4
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.4
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.14.1.4/aerospike-server-community-3.14.1.4-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17d793a8b1cd4d41a326432dcb6714be
+_md5_=365fb8bcb4ef5f094b0f9add076de301
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.5 b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.5
index 675d13a464c0..247bfaf73247 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.5
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.5
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.14.1.5/aerospike-server-community-3.14.1.5-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=17d793a8b1cd4d41a326432dcb6714be
+_md5_=365fb8bcb4ef5f094b0f9add076de301
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.1 b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.1
index b76cf01f7101..41c64452f90c 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.1
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.15.0.1/aerospike-server-community-3.15.0.1-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b792c6044b63ad6e77042439b8b150e6
+_md5_=aa2509e11ffbc26419f53e9d6e3b793b
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.2 b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.2
index 9661acf11ebe..dd0ddf076edd 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.2
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.0.2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.15.0.2/aerospike-server-community-3.15.0.2-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b792c6044b63ad6e77042439b8b150e6
+_md5_=aa2509e11ffbc26419f53e9d6e3b793b
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.3 b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.3
index 082713898439..908b03253230 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.3
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+DEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sys-libs/readline sys-libs/zlib dev-libs/openssl
+RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.15.1.3/aerospike-server-community-3.15.1.3-debian7.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=7d5cfc22fc639e63f2d5187aad0a8ce7
+_md5_=df4d0bd1d13a6cb04eb05d533fedbff2
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-9999 b/metadata/md5-cache/dev-db/aerospike-server-community-9999
index a3127b6682cd..67f21cbf2119 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-9999
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install prepare setup unpack
-DEPEND=app-crypt/gcr dev-libs/jansson dev-libs/jemalloc dev-vcs/git virtual/pkgconfig
+DEPEND=app-crypt/gcr dev-libs/jansson dev-libs/jemalloc >=dev-vcs/git-1.8.2.1 virtual/pkgconfig
 DESCRIPTION=Flash-optimized, in-memory, nosql database
 EAPI=5
 HOMEPAGE=http://www.aerospike.com
@@ -7,5 +7,5 @@ IUSE=+tools
 LICENSE=AGPL-3
 RDEPEND=app-crypt/gcr dev-libs/jansson dev-libs/jemalloc
 SLOT=0
-_eclasses_=git-2	195a672bfaf52d868442171c9469bbb6	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ba535294203551d79ec023192832c283
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	185a06792159ca143528e7010368e8af	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=587f5d413353cf5dc3f74762c5011310
diff --git a/metadata/md5-cache/dev-db/phppgadmin-9999 b/metadata/md5-cache/dev-db/phppgadmin-9999
index 022951369fb7..c668ebecceb2 100644
--- a/metadata/md5-cache/dev-db/phppgadmin-9999
+++ b/metadata/md5-cache/dev-db/phppgadmin-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=>=app-admin/webapp-config-1.50.15 dev-vcs/git
+DEPEND=>=app-admin/webapp-config-1.50.15 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Web-based administration for Postgres database in php
 EAPI=2
 HOMEPAGE=http://phppgadmin.sourceforge.net/
@@ -7,5 +7,5 @@ IUSE=vhosts
 LICENSE=GPL-2
 RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[postgres,session] >=app-admin/webapp-config-1.50.15
 SLOT=9999
-_eclasses_=git-2	195a672bfaf52d868442171c9469bbb6	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=ab9bb097525d6a6b772586753dbaee75
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=e9318cdf5ff5fb7f6faaa1dfa145718b
diff --git a/metadata/md5-cache/dev-embedded/bitbake-1.17.0 b/metadata/md5-cache/dev-embedded/bitbake-1.17.0
index f0c8f1c424a8..3e2ca9969f2b 100644
--- a/metadata/md5-cache/dev-embedded/bitbake-1.17.0
+++ b/metadata/md5-cache/dev-embedded/bitbake-1.17.0
@@ -6,9 +6,9 @@ HOMEPAGE=http://git.openembedded.org/bitbake/
 IUSE=doc python_targets_python2_7
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=dev-python/ply dev-python/progressbar python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/openembedded/bitbake/archive/1.17.0.tar.gz -> bitbake-1.17.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84b75e128621b5fab8063692666d3950
+_md5_=cdbf53f912c60aac1ebb8ee867f83609
diff --git a/metadata/md5-cache/dev-embedded/bitbake-9999 b/metadata/md5-cache/dev-embedded/bitbake-9999
index 5bbb2836e5e0..1927188f9564 100644
--- a/metadata/md5-cache/dev-embedded/bitbake-9999
+++ b/metadata/md5-cache/dev-embedded/bitbake-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=doc? ( dev-libs/libxslt ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git
+DEPEND=doc? ( dev-libs/libxslt ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=package management tool for OpenEmbedded
 EAPI=5
 HOMEPAGE=http://git.openembedded.org/bitbake/
 IUSE=doc python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-python/ply dev-python/progressbar python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d327e4c0c1fbc29efa0f0600c8a9d851
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f93b67c297b5fdcd3b15792b6fe768e1
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.10.0 b/metadata/md5-cache/dev-embedded/openocd-0.10.0
index aab573272c7d..82a7e93fced7 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9707ba59ed0b29d25c0506339f957c93
+_md5_=05249801af3e0f8129b970c4394c62c7
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.5.0 b/metadata/md5-cache/dev-embedded/openocd-0.5.0
index 0e0739e472c1..2b090f840fd9 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.5.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.5.0
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.5.0/openocd-0.5.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c7824d5a0a8a8abfb053d13704dbca85
+_md5_=dccf0e2157e6341d7c84e3b038df29f5
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.6.1 b/metadata/md5-cache/dev-embedded/openocd-0.6.1
index 1db4534075c9..e673fba739e2 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.6.1
+++ b/metadata/md5-cache/dev-embedded/openocd-0.6.1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.6.1/openocd-0.6.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ef522c433551214ce76030ac6566112d
+_md5_=041bc36ddb2556db9b99ac41684c8716
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.7.0-r1 b/metadata/md5-cache/dev-embedded/openocd-0.7.0-r1
index 31ae1bf73df0..87576539fec3 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.7.0-r1
+++ b/metadata/md5-cache/dev-embedded/openocd-0.7.0-r1
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.7.0/openocd-0.7.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fbf41cdda5ea4d0f886856a85f764092
+_md5_=0a29b45d9b77e8c27af61ee8d849a0ca
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.8.0 b/metadata/md5-cache/dev-embedded/openocd-0.8.0
index 87d49ead98c7..e8457a05c1a5 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.8.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.8.0
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.8.0/openocd-0.8.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9788ede67ea6bc99726513a9f88031d1
+_md5_=c71807dd6d6ddb511d9f43eed151288c
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.9.0 b/metadata/md5-cache/dev-embedded/openocd-0.9.0
index 5713dddace58..6396cde6ccec 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.9.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.9.0
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.9.0/openocd-0.9.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=3d5fffa9b1893b1194f37ef82c72a23f
+_md5_=f8a9fabcc8243fc76a1d77f8f138287a
diff --git a/metadata/md5-cache/dev-embedded/openocd-9999 b/metadata/md5-cache/dev-embedded/openocd-9999
index b78cf726031a..97e57f6681d7 100644
--- a/metadata/md5-cache/dev-embedded/openocd-9999
+++ b/metadata/md5-cache/dev-embedded/openocd-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig >=sys-apps/texinfo-5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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 dev-vcs/git
+DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig >=sys-apps/texinfo-5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=5
 HOMEPAGE=http://openocd.sourceforge.net
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9707ba59ed0b29d25c0506339f957c93
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=05249801af3e0f8129b970c4394c62c7
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.74-r1 b/metadata/md5-cache/dev-lang/jimtcl-0.74-r1
index f33280ea1f57..323b1543c8d0 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.74-r1
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.74-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.74 -> jimtcl-0.74.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=01a7e499312ba8c9bef8e1188b6cf825
+_md5_=864b94b9b0d50ec42f0cf13fa2592254
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.75 b/metadata/md5-cache/dev-lang/jimtcl-0.75
index 3d903b021f41..3bf788159c43 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.75
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.75
@@ -9,4 +9,4 @@ LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.75 -> jimtcl-0.75.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=cc3c9506e8ff750476be3e86fe47beb6
+_md5_=4bb0e875aecd28572f1ec89876e0deb6
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.75-r1 b/metadata/md5-cache/dev-lang/jimtcl-0.75-r1
index 844bec27852c..abf3906476b1 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.75-r1
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.75-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.75 -> jimtcl-0.75.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=33a15272d7cade78e259a24ec9177742
+_md5_=6385832c0d5043110f805a55d3c78b49
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.76 b/metadata/md5-cache/dev-lang/jimtcl-0.76
index 30fae8fe852b..5d42e1573157 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-0.76
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.76
@@ -9,4 +9,4 @@ LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/msteveb/jimtcl/zipball/0.76 -> jimtcl-0.76.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=99fecc8f23e225e2f1feb72f4996190e
+_md5_=d2b3bf8a8896e58d275968727db757e9
diff --git a/metadata/md5-cache/dev-lang/jimtcl-9999 b/metadata/md5-cache/dev-lang/jimtcl-9999
index 8f4574c56414..89c14181ac0d 100644
--- a/metadata/md5-cache/dev-lang/jimtcl-9999
+++ b/metadata/md5-cache/dev-lang/jimtcl-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip dev-vcs/git
+DEPEND=doc? ( app-text/asciidoc ) app-arch/unzip >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Small footprint implementation of Tcl programming language
 EAPI=5
 HOMEPAGE=http://jim.tcl.tk/
 IUSE=doc static-libs
 LICENSE=LGPL-2
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=33a15272d7cade78e259a24ec9177742
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=6385832c0d5043110f805a55d3c78b49
diff --git a/metadata/md5-cache/dev-lang/opendylan-2013.1-r1 b/metadata/md5-cache/dev-lang/opendylan-2013.1-r1
index 8f57cd2e8179..a2956f821e95 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2013.1-r1
+++ b/metadata/md5-cache/dev-lang/opendylan-2013.1-r1
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://opendylan.org/downloads/opendylan/2013.1/opendylan-2013.1-sources.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=131b57433ad50eb1165a0a1d6699d040
+_md5_=0bde578f6538c01ef8f34b45e51a3ac0
diff --git a/metadata/md5-cache/dev-lang/opendylan-2013.2 b/metadata/md5-cache/dev-lang/opendylan-2013.2
index e95cd9e145e3..86ef3023f5c8 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2013.2
+++ b/metadata/md5-cache/dev-lang/opendylan-2013.2
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-sources.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=28c2ae437e209badce6549d84572dcd2
+_md5_=d7dfb69362b61130d44c6dd7491b6d4a
diff --git a/metadata/md5-cache/dev-lang/opendylan-2014.1 b/metadata/md5-cache/dev-lang/opendylan-2014.1
index 87ce806f8035..c4046b6e68a8 100644
--- a/metadata/md5-cache/dev-lang/opendylan-2014.1
+++ b/metadata/md5-cache/dev-lang/opendylan-2014.1
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://opendylan.org/downloads/opendylan/2014.1/opendylan-2014.1-sources.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6e592dfc7c46d945de92907276957818
+_md5_=681e60b7b41a9690437a657b7505d02d
diff --git a/metadata/md5-cache/dev-lang/opendylan-9999 b/metadata/md5-cache/dev-lang/opendylan-9999
index b271184c04be..451f64a17ad9 100644
--- a/metadata/md5-cache/dev-lang/opendylan-9999
+++ b/metadata/md5-cache/dev-lang/opendylan-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) >=app-portage/elt-patches-20170422 !<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 dev-vcs/git
+DEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan ) >=app-portage/elt-patches-20170422 !<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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=OpenDylan language runtime environment
 EAPI=4
 HOMEPAGE=http://opendylan.org
@@ -7,5 +7,5 @@ LICENSE=Opendylan
 RDEPEND=dev-libs/boehm-gc[threads] dev-lang/perl dev-perl/XML-Parser || ( dev-lang/opendylan-bin dev-lang/opendylan )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ea7f58ebfb8ff40f8e5685931e9493a0
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=042fa5d018b2180e0e820ca0ae52659d
diff --git a/metadata/md5-cache/dev-lang/rebol-9999 b/metadata/md5-cache/dev-lang/rebol-9999
index 241f55e7451b..b1eb6c7faaf8 100644
--- a/metadata/md5-cache/dev-lang/rebol-9999
+++ b/metadata/md5-cache/dev-lang/rebol-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare unpack
-DEPEND=|| ( dev-lang/rebol dev-lang/rebol-bin ) dev-vcs/git
+DEPEND=|| ( dev-lang/rebol dev-lang/rebol-bin ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Relative Expression-Based Object Language
 EAPI=4
 HOMEPAGE=http://rebol.com
 LICENSE=Apache-2.0
 RDEPEND=|| ( dev-lang/rebol dev-lang/rebol-bin )
 SLOT=0
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0d06e2838639ac18f455cbc95428ee17
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=b248e0c3297fc347f32d039eb6971273
diff --git a/metadata/md5-cache/dev-lang/yasm-9999 b/metadata/md5-cache/dev-lang/yasm-9999
index fd7d27a513b3..5cd0a0d3e228 100644
--- a/metadata/md5-cache/dev-lang/yasm-9999
+++ b/metadata/md5-cache/dev-lang/yasm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare test unpack
-DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-text/xmlto app-text/docbook-xml-dtd:4.1.2 >=app-portage/elt-patches-20170422 !<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 dev-vcs/git
+DEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) nls? ( sys-devel/gettext ) python? ( >=dev-python/cython-0.14[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-text/xmlto app-text/docbook-xml-dtd:4.1.2 >=app-portage/elt-patches-20170422 !<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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=An assembler for x86 and x86_64 instruction sets
 EAPI=5
 HOMEPAGE=http://yasm.tortall.net/
@@ -8,5 +8,5 @@ LICENSE=BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )
 RDEPEND=nls? ( virtual/libintl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7266b14175a7c53c6cd9236fafee7c7f
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=30afd575156d16447a23351b473afb06
diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.3 b/metadata/md5-cache/dev-libs/cloog-0.18.3
index fbddbe8544be..3aa8e405c80c 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.18.3
+++ b/metadata/md5-cache/dev-libs/cloog-0.18.3
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/4
 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=15c8e9c896eba397b8bb4f6f74e8fbb1
+_md5_=51b339d0490e3aad01abe833f11a7fc1
diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.4 b/metadata/md5-cache/dev-libs/cloog-0.18.4
index d87d9b7d3237..e9ac35869238 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.18.4
+++ b/metadata/md5-cache/dev-libs/cloog-0.18.4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/gmp-6.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 SLOT=0/4
 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=6a3b5c1a23bfbebfe1e3f3c391aa234c
+_md5_=b805bb3058b5aa6dba5599d6cbdb25ac
diff --git a/metadata/md5-cache/dev-libs/cloog-9999 b/metadata/md5-cache/dev-libs/cloog-9999
index 2bf3d01335c4..a59cb75feb97 100644
--- a/metadata/md5-cache/dev-libs/cloog-9999
+++ b/metadata/md5-cache/dev-libs/cloog-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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 dev-vcs/git
+DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170422 !<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 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A loop generator for scanning polyhedra
 EAPI=5
 HOMEPAGE=http://www.bastoul.net/cloog/
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-6.0.0[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(-)?] >=dev-libs/isl-0.15:0=[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(-)?] !dev-libs/cloog-ppl
 SLOT=0/4
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=290a15dbb1f7697e39544f22aeea72f3
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=5685fe72604fcc2d58fa81bdd894c3a2
diff --git a/metadata/md5-cache/dev-lua/ldoc-1.4.6 b/metadata/md5-cache/dev-lua/ldoc-1.4.6
index 8ba77bf5b5d0..fca14336f519 100644
--- a/metadata/md5-cache/dev-lua/ldoc-1.4.6
+++ b/metadata/md5-cache/dev-lua/ldoc-1.4.6
@@ -3,10 +3,10 @@ DEPEND=dev-lua/penlight
 DESCRIPTION=A LuaDoc-compatible documentation generation system
 EAPI=6
 HOMEPAGE=https://stevedonovan.github.io/ldoc/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 RDEPEND=dev-lua/penlight
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/stevedonovan/LDoc/archive/1.4.6.tar.gz -> ldoc-1.4.6.tar.gz
-_md5_=a8feb53b60dcb022c8ab6104485aca57
+_md5_=726cb207748cf421e6af89daf598319f
diff --git a/metadata/md5-cache/dev-lua/penlight-1.3.2 b/metadata/md5-cache/dev-lua/penlight-1.3.2
index 54e61053f287..59f47ccea5f1 100644
--- a/metadata/md5-cache/dev-lua/penlight-1.3.2
+++ b/metadata/md5-cache/dev-lua/penlight-1.3.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/lua-5.1:= app-arch/unzip virtual/pkgconfig
 DESCRIPTION=Lua utility libraries loosely based on the Python standard libraries
 EAPI=5
 HOMEPAGE=http://stevedonovan.github.com/Penlight,
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1:= dev-lua/luafilesystem
 SLOT=0
 SRC_URI=http://stevedonovan.github.io/files/penlight-1.3.2-core.zip
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=7a886928ab59bfe250ae339c34ecbf17
+_md5_=fbe1e4e98ed96c92189f6a66d85c0150
diff --git a/metadata/md5-cache/dev-python/pysha3-1.0.2 b/metadata/md5-cache/dev-python/pysha3-1.0.2
index 213733250e2d..946a073a4802 100644
--- a/metadata/md5-cache/dev-python/pysha3-1.0.2
+++ b/metadata/md5-cache/dev-python/pysha3-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=SHA-3 (Keccak) for Python 2.7 - 3.5
 EAPI=6
 HOMEPAGE=https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=CC0-1.0 PSF-2
 RDEPEND=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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysha3/pysha3-1.0.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=184be9a15297d0dcbef87542e978b89b
+_md5_=71de25cc523e2b6d20c107737b3ab2b3
diff --git a/metadata/md5-cache/x11-wm/awesome-4.2 b/metadata/md5-cache/x11-wm/awesome-4.2
index c2cef2c82d38..18d1ebd6095a 100644
--- a/metadata/md5-cache/x11-wm/awesome-4.2
+++ b/metadata/md5-cache/x11-wm/awesome-4.2
@@ -4,10 +4,10 @@ DESCRIPTION=A dynamic floating and tiling window manager
 EAPI=6
 HOMEPAGE=https://awesomewm.org/
 IUSE=dbus doc elibc_FreeBSD gnome luajit
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 dev-libs/glib:2 >=dev-libs/libxdg-basedir-1 >=dev-lua/lgi-0.8 x11-libs/cairo[xcb] x11-libs/gdk-pixbuf:2 >=x11-libs/libxcb-1.6 >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 >=x11-libs/xcb-util-0.3.8 x11-libs/xcb-util-cursor >=x11-libs/xcb-util-keysyms-0.3.4 >=x11-libs/xcb-util-wm-0.3.8 >=x11-libs/xcb-util-xrm-1.0 x11-libs/libXcursor x11-libs/libxkbcommon[X] >=x11-libs/libX11-1.3.99.901 dbus? ( >=sys-apps/dbus-1 ) elibc_FreeBSD? ( dev-libs/libexecinfo )
 SLOT=0
 SRC_URI=https://github.com/awesomeWM/awesome-releases/raw/master/awesome-4.2.tar.xz
 _eclasses_=cmake-utils	77a5a8d3308359caadcdd91688f20093	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56ad50304f4efeae329ebd2c477bb1e5
+_md5_=76aca995af36bb70b9fba9e1afab1aa9
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8d9ceff9b625..61abdec54da4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2017 18:54:02 +0000
+Mon, 25 Dec 2017 19:46:56 +0000
author	Repository QA checks <repo-qa-checks@gentoo.org>	2017-12-25 19:46:57 +0000
committer	Repository QA checks <repo-qa-checks@gentoo.org>	2017-12-25 19:46:57 +0000
commit	e757887c1d03673f9de5992077685a8788ed5501 (patch)
tree	e3bd882cd50337d48768b2d5653db77e981c638e
parent	Merge updates from master (diff)
download	gentoo-e757887c1d03673f9de5992077685a8788ed5501.tar.gz gentoo-e757887c1d03673f9de5992077685a8788ed5501.tar.bz2 gentoo-e757887c1d03673f9de5992077685a8788ed5501.zip