Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

6 files changed, 21 insertions, 8 deletions

diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5a6a0a738ae6..3fffcdf73313 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/eterm-0.9.5 b/metadata/md5-cache/x11-terms/eterm-0.9.5
new file mode 100644
index 000000000000..5a111bfde588
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install unpack
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A vt102 terminal emulator for X
+EAPI=2
+HOMEPAGE=http://www.eterm.org/
+IUSE=escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86
+LICENSE=BSD
+RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
+SLOT=0
+SRC_URI=http://www.eterm.org/download/Eterm-0.9.5.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.5.tar.gz ) mirror://sourceforge/eterm/Eterm-0.9.5.tar.gz !minimal? ( mirror://sourceforge/eterm/Eterm-bg-0.9.5.tar.gz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5c80b1cfcfae4e82474350bb3e09982a
diff --git a/metadata/md5-cache/x11-terms/eterm-0.9.6-r2 b/metadata/md5-cache/x11-terms/eterm-0.9.6-r2
index 9fb0b80978d0..43df8fea4853 100644
--- a/metadata/md5-cache/x11-terms/eterm-0.9.6-r2
+++ b/metadata/md5-cache/x11-terms/eterm-0.9.6-r2
@@ -4,9 +4,9 @@ DESCRIPTION=A vt102 terminal emulator for X
 EAPI=6
 HOMEPAGE=http://www.eterm.org/
 IUSE=escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libast media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 SLOT=0
 SRC_URI=http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
-_md5_=74e0f1fa78c507ddad14b97fa7a7fbb5
+_md5_=c3f82d5b6f3ecd2dcee71d7e5845fad5
diff --git a/metadata/md5-cache/x11-terms/terminology-1.2.1 b/metadata/md5-cache/x11-terms/terminology-1.2.1
index 65c3ce7acf36..3f052c0c0ac2 100644
--- a/metadata/md5-cache/x11-terms/terminology-1.2.1
+++ b/metadata/md5-cache/x11-terms/terminology-1.2.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.2.1.tar.xz
-_eclasses_=meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=meson	1c51f78a21ad0246b92159d6fef85362	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f47b22f10b77b3bdcc194d16e92957c4
diff --git a/metadata/md5-cache/x11-terms/terminology-9999 b/metadata/md5-cache/x11-terms/terminology-9999
index d299f6c244bf..93b4abf66ac2 100644
--- a/metadata/md5-cache/x11-terms/terminology-9999
+++ b/metadata/md5-cache/x11-terms/terminology-9999
@@ -7,5 +7,5 @@ IUSE=nls
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]
 SLOT=0
-_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	1c51f78a21ad0246b92159d6fef85362	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
 _md5_=b49dfc2dd92aacbd9fa4df37e8c9d27f
diff --git a/metadata/md5-cache/x11-terms/xvt-2.1-r3 b/metadata/md5-cache/x11-terms/xvt-2.1-r3
index b5774fc817f0..4a5be20f7c9b 100644
--- a/metadata/md5-cache/x11-terms/xvt-2.1-r3
+++ b/metadata/md5-cache/x11-terms/xvt-2.1-r3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=install prepare
 DEPEND=x11-libs/libX11 x11-base/xorg-proto
 DESCRIPTION=A tiny vt100 terminal emulator for X
-EAPI=6
+EAPI=2
 HOMEPAGE=ftp://ftp.x.org/R5contrib/xvt-1.0.README
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=xvt
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z mirror://gentoo/xvt-2.1.diff.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=319f0dd701b03aec3e2e373739c0060c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0b2856b34e2353c3e6468cd4db4e7d9a