gentoo resync : 15.01.2020

3 files changed, 2 insertions, 48 deletions

diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 0591aff2a437..e43f68b9234f 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,3 @@
-DIST terminology-1.5.0.tar.xz 4884284 BLAKE2B fff45958207bd6e06b8685ebe42ca734b183da9042940b773e15308200c27307f417a930a687c187a5f24f1eab9d1b7a518314b3cd919d260bb05369a2f2236c SHA512 ade2363e0a834b25a67157d0cfa946b3b09d8a2941fd7da9dd3792cf8d201f218c7723b691eab325d9bdadeefddfea56c19e562ebc37466cb3a9b3b45c9f708b
 DIST terminology-1.6.0.tar.xz 4893348 BLAKE2B 20c9b8a916a4cd48055839266a157d5d8fca70557f7fb8b61696ceeaf4bc0fd93ea5abc0930d1c552a816e3fa3e455624f62d4adbad7feacc9cd0e874a91feec SHA512 ef95a5d128736a2e6b3b9e48a3f32a8e3a1f19ccabcb9fa429ed777ee201ba16fa431a61edafaebc018567f4a3657d81551407cf0449f58b416aa1e6077afec1
-EBUILD terminology-1.5.0.ebuild 864 BLAKE2B 36c00aa1e5bc52e26f9ab041f9d31df08fd6b76514f6085a26dd58c68ceb67f7244eff0af33dac8d430642f87980ccc675aea7c966e6eb935e4db7feb4184712 SHA512 4d3081f5580b44e9619eac1c9826c1fc9b85a6e2aae7d4de7a19945f1ec8cdb851beca96051958089c907acf4384e4872a32a7e61fe396dd0725b0a19b90ca1e
-EBUILD terminology-1.6.0.ebuild 866 BLAKE2B 45d945cf025162170ed8b024c7d894948c1a8ca1c0c3bf5e87867c23086ce4f88857a750f8304b38e3e4dadb5203af31eec9744cd0b87477dffe7a61a6b24264 SHA512 7222d8bb616e6a8438c31fd0f9f0065133a20b7e3a15b27912fc45b551dd183fbd03c2a0380b46f08497a398fb373d0baa5a0d407997feec29f203d5492dceea
+EBUILD terminology-1.6.0.ebuild 864 BLAKE2B 36c00aa1e5bc52e26f9ab041f9d31df08fd6b76514f6085a26dd58c68ceb67f7244eff0af33dac8d430642f87980ccc675aea7c966e6eb935e4db7feb4184712 SHA512 4d3081f5580b44e9619eac1c9826c1fc9b85a6e2aae7d4de7a19945f1ec8cdb851beca96051958089c907acf4384e4872a32a7e61fe396dd0725b0a19b90ca1e
 MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/terminology-1.5.0.ebuild b/x11-terms/terminology/terminology-1.5.0.ebuild
deleted file mode 100644
index 01c5736f1c75..000000000000
--- a/x11-terms/terminology/terminology-1.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 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 ~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.6.0.ebuild b/x11-terms/terminology/terminology-1.6.0.ebuild
index 65b045e742ae..01c5736f1c75 100644
--- a/x11-terms/terminology/terminology-1.6.0.ebuild
+++ b/x11-terms/terminology/terminology-1.6.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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="extras nls"
 
 RDEPEND="