gentoo resync : 18.12.2017

4 files changed, 9 insertions, 23 deletions

diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index b7908c2badca..3568a2d6d03e 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/aterm-1.0.1-r2 b/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
deleted file mode 100644
index fca9d5481b64..000000000000
--- a/metadata/md5-cache/x11-terms/aterm-1.0.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/jpeg media-libs/libpng background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE x11-libs/libXt x11-proto/xproto
-DESCRIPTION=rxvt compatible terminal emulator with transparency support
-EAPI=3
-HOMEPAGE=http://aterm.sourceforge.net
-IUSE=background cjk xgetdefault
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=virtual/jpeg media-libs/libpng background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE
-SLOT=0
-SRC_URI=ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4e8ec791fd9298a27194f8ebe527d76c
diff --git a/metadata/md5-cache/x11-terms/aterm-1.0.1-r3 b/metadata/md5-cache/x11-terms/aterm-1.0.1-r3
index 8793066daa0f..02eee458e362 100644
--- a/metadata/md5-cache/x11-terms/aterm-1.0.1-r3
+++ b/metadata/md5-cache/x11-terms/aterm-1.0.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=rxvt compatible terminal emulator with transparency support
 EAPI=6
 HOMEPAGE=http://aterm.sourceforge.net
 IUSE=background cjk xgetdefault
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=virtual/jpeg:0 media-libs/libpng:0= background? ( x11-wm/afterstep ) x11-libs/libX11 x11-libs/libXext x11-libs/libICE
 SLOT=0
 SRC_URI=ftp://ftp.afterstep.org/apps/aterm/aterm-1.0.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a6fcb5a0b5460c21e17e12eadc53ee0f
+_md5_=8cc607e7cad762f908a5707229ca6dfb
diff --git a/metadata/md5-cache/x11-terms/terminology-9999 b/metadata/md5-cache/x11-terms/terminology-9999
index 1596570c759f..39ae212ba19f 100644
--- a/metadata/md5-cache/x11-terms/terminology-9999
+++ b/metadata/md5-cache/x11-terms/terminology-9999
@@ -1,11 +1,10 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/efl-1.18 virtual/pkgconfig >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170422 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 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-libs/efl-1.18[X] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.enlightenment.org/p.php?p=about/terminology
-IUSE=nls doc
-LICENSE=BSD
-RDEPEND=>=dev-libs/efl-1.18 nls? ( sys-devel/gettext )
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/efl-1.18[X]
 SLOT=0
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	enlightenment	ac1fc335a7f44c04309a9f4aae403165	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-2	195a672bfaf52d868442171c9469bbb6	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4b88f351ea3aec9269362d3f3446edb9
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	meson	0946ddca90e9c2d3e4687bb097dd9ed3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=150071e98905454b5196ce51df99304a