gentoo resync : 13.06.2020

3 files changed, 2 insertions, 48 deletions

diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 9ca65843f42c..937ea8f62c60 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,3 @@
-DIST terminology-1.6.0.tar.xz 4893348 BLAKE2B 20c9b8a916a4cd48055839266a157d5d8fca70557f7fb8b61696ceeaf4bc0fd93ea5abc0930d1c552a816e3fa3e455624f62d4adbad7feacc9cd0e874a91feec SHA512 ef95a5d128736a2e6b3b9e48a3f32a8e3a1f19ccabcb9fa429ed777ee201ba16fa431a61edafaebc018567f4a3657d81551407cf0449f58b416aa1e6077afec1
 DIST terminology-1.7.0.tar.xz 4922616 BLAKE2B 40ca7bfff534e773b4c188970ecd82e44c2eee7a75eb2a6d4fc6a8635c57857e2037a319818a437843271faa42995f25b613091a4463c02427d835c6ae572722 SHA512 9635da6a51344fbbafd333592252c2539daa795600b4a1d5ea5710e294f18ff9f5667706c789a3c91378b493ae631df47faec2bc43b4cc48d0266506ab3f2e78
-EBUILD terminology-1.6.0.ebuild 869 BLAKE2B e7329ccfab1942c6387dd366a3d201ed4e1cff240ab9545f4ab1c393d6f3ba18d1380792a281f3400a243ea1882b4b44a899c34492ef077a6b4531faedb9d070 SHA512 651367c30110d89c2c7d0285787747d9756949b61bb0b5afa6f61290d87f1f51f79d4f70f840cb7ebcdbf59b93ca54ddcad4a81b6634a01d1622dfd67d545ac7
-EBUILD terminology-1.7.0.ebuild 865 BLAKE2B 5920556e9e8824b6e0cb7f5c27717ed7aefc9c0a66f2b61dc039b62bf794d94f06647ea57307e554edea8efdb7513453ae2b949ccb18511fe9e10f241b0f528b SHA512 9d11298aed9e010a0ba4a55094144d16047269f9d514e82e7cf7779e87c94e2e2b11a97f2cc50677e0432e468c4ace975c4fafdc2918364fabb1f887f435cb1f
+EBUILD terminology-1.7.0.ebuild 863 BLAKE2B be914264f24ea3409404756bc6e47c706993acd1fa709acadf805e3a4ef09aea314985e8d0e4e47f54419d435e8f0cf3d2249f641eec6ab7cd8d7bf5a9dac54c SHA512 cd6dda2aadea2a97386771914a161443c2379936ff2eff3bfc47ab40605994d54e5e9f981cedc23bcca5a4c296e3eb309088f1fbe854e42087dae7aed9e91c6e
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.6.0.ebuild b/x11-terms/terminology/terminology-1.6.0.ebuild
deleted file mode 100644
index bdbffee66726..000000000000
--- a/x11-terms/terminology/terminology-1.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
-HOMEPAGE="https://www.enlightenment.org/about-terminology"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="extras nls"
-
-RDEPEND="
-	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
-	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
-	app-arch/lz4
-	dev-libs/efl[eet,fontconfig]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use nls)
-		$(meson_use extras tests)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-terms/terminology/terminology-1.7.0.ebuild b/x11-terms/terminology/terminology-1.7.0.ebuild
index 1e62124d474c..fd7f3fd7458a 100644
--- a/x11-terms/terminology/terminology-1.7.0.ebuild
+++ b/x11-terms/terminology/terminology-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="extras nls"
 
 RDEPEND="|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )