gentoo resync : 20.05.2018

6 files changed, 8 insertions, 62 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 094ff6341c18..45228f27db98 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index a9f198abae5e..7b9bc363ceac 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,10 +1,8 @@
 DIST terminology-0.9.1.tar.xz 4961876 BLAKE2B 03aab7c5c0740bede4c06b90721d96c121500009b6dd939387e8bd3dae160b4c705cf95a724dd8cc404badc9b9d5f22a5321312f229dd488331e4c4c1e2b0844 SHA512 c6db9fa62f3f168be635da1e3ed7a13deba13cbfa5bed75e3f97ee6e13837ca9cb5facab48c44f200baed34b8f32f852eadd9844de648795733602602fae32fd
 DIST terminology-1.0.0.tar.xz 4979420 BLAKE2B cbc78b751a2e6812ab31c69a62ea4abe2bb53f12b647cea7adae03e54fe0a238c56c5c029c43057c3a1326c7c8af0412574a85a404896554a142ed068ab581ab SHA512 5c99e1e1eea0de24d67779059d3ba65a8fbd1fdf63d9f22099e38defc11fdc8923fbe50a7276bc483ce5ee7527f665e3f2c48358d85c3a06f33e551bd8ef2320
-DIST terminology-1.2.0.tar.xz 4858040 BLAKE2B 831ea173fcf8d0327e5ea6a64a827e221eeef5125a7ed6722cc479ff1e3649b653908f97dd5478b24e13463b53634aba14786f9d39da6ad8ba64b982f28f2d7c SHA512 3f017d4706de0de7de5800adad39b5d168f4447279942a452b98529044d3c5e88fc00aa96078420829283ddc454d85d7e5b1d8b557a38d5be8ad266020a3f40b
 DIST terminology-1.2.1.tar.xz 4858528 BLAKE2B 953917ed9dac9d17048d19394e6d8b38fd1673bc618cd1ecb596eee7b889f973b5622ef9d3424bc9f94928f44129062a7a4f88cdb2af519b87aeb141661902bc SHA512 8485d38a5426ac0f32b3cb049170bfa015a9f648134973462d72412b291b160f05b6ccfb3ba47115740946c8d87160401d55672a6853027d0cc216bdc7cc659b
 EBUILD terminology-0.9.1.ebuild 506 BLAKE2B 3097c37a90df56759cbaf924688fdfa0d54ae3f66ca0081fccde7a7f6a5b1d0555f93dd7ca5920079f5490a45f73792c7d24d9de709fcd7ddd55be8982213a93 SHA512 caff7eac7a6502dbbe1141f46ebd187979ff4c68660dada0e6f887a7415c178d53667d3d12486ea12350b9aacb9058e85bc251215cce0b10049c5b8ab585717a
 EBUILD terminology-1.0.0.ebuild 588 BLAKE2B a750d055620ae81bc6c700dd1878078383542bbc90a32c052a85c78a9e5755909ea77b5ab746d71cc1c7d11fdc9ebee789977c9efe7d3ed53fe2e0eaa32ccc9c SHA512 a68f7ecc0f45cfd251bd45b7d7363c89ab2f321f38480424106a8cd1903894c88fb4a5a506c585cf4002ed380261fdfb56f301522de3ffda7993e291a3b81c57
-EBUILD terminology-1.2.0.ebuild 638 BLAKE2B ca7bf0ee9c4bc7da9be7dfaa55705b6fe2e2cab8233552c05da655f560fad020e0221b7795d86d0b827d4295b64461fb43e44e852eda0e8e2cee5abb459bfd5b SHA512 474aa190b76c91684a6b8041c054ced1f4fe07918f235e224315edd8b755b828990a1a40c04197e33ddd4feed6ca6a7dd619c9bbf6aad8a8e47ce57813255a27
-EBUILD terminology-1.2.1.ebuild 638 BLAKE2B ca7bf0ee9c4bc7da9be7dfaa55705b6fe2e2cab8233552c05da655f560fad020e0221b7795d86d0b827d4295b64461fb43e44e852eda0e8e2cee5abb459bfd5b SHA512 474aa190b76c91684a6b8041c054ced1f4fe07918f235e224315edd8b755b828990a1a40c04197e33ddd4feed6ca6a7dd619c9bbf6aad8a8e47ce57813255a27
+EBUILD terminology-1.2.1.ebuild 700 BLAKE2B f0c11e7f43f92092af3c9b018e060dc571bda815d6c72cb4ee7b7768a22bbb54bee0cf6b74baac73b914cf338f2c96d2ae181edb2ab5e265827b348b9e41afb0 SHA512 084aae49a9b8c1a69c2df6064c5b9cb2b8a7f0e9fed8241d1166cae0e0479faa8ca29b5f24f822c9bcf256533a7fca24de112e7e3faa4afd3d9e1bb4b68e73e1
 EBUILD terminology-9999.ebuild 613 BLAKE2B ad5f54699246970a99269ea732cad80b6ee9f54fab5e58cf7f2c1de62524fc1df41a73c86666c8d137f730bda7b79d69570aad30400117619dbd52447043e35e SHA512 eb175b2fd00417c572df9613d105a7ed37290572f131eae502e7718feed7a9df71478c0657348f4a6ed5854a8654f6773c015826b9b5b23f6c5e6a3cd682dfb9
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-terms/terminology/terminology-1.2.0.ebuild b/x11-terms/terminology/terminology-1.2.0.ebuild
deleted file mode 100644
index 30208be73e72..000000000000
--- a/x11-terms/terminology/terminology-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-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 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local emesonargs=(
-		-D nls=$(usex nls true false)
-	)
-
-	meson_src_configure
-}
diff --git a/x11-terms/terminology/terminology-1.2.1.ebuild b/x11-terms/terminology/terminology-1.2.1.ebuild
index 30208be73e72..dfc6458bbd59 100644
--- a/x11-terms/terminology/terminology-1.2.1.ebuild
+++ b/x11-terms/terminology/terminology-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit meson
+inherit meson xdg-utils
 
 DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
 HOMEPAGE="https://www.enlightenment.org/about-terminology"
@@ -21,6 +21,12 @@ DEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+src_prepare() {
+	default
+
+	xdg_environment_reset
+}
+
 src_configure() {
 	local emesonargs=(
 		-D nls=$(usex nls true false)
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index f3d2faca7894..5efb3af0c6f1 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -3,5 +3,4 @@ AUX tilda-0.9.6-glib-single-include.patch 204 BLAKE2B 8ee254da128ef666684fc6cdd3
 AUX tilda-0.9.6-makefile.patch 689 BLAKE2B d2132b3567d9bfdf9301184c73e5ba5f7add927f7d3d865473d8ebbda7e2d89aeb3ffa99cab95ecb96ea70f57cb874be1fe8badf4c90bb15f28d49113585cfeb SHA512 45ee0e4eb3ec9a62c5fd1b607fd548141738528bf4c82254a68b81baca1c52f10af81ca5c8450ea3dd6af6709d5e11e0d1d7bb7b6a77b88cf1c169677be1b7ed
 DIST tilda-0.9.6.tar.gz 307517 BLAKE2B dba49f28cf92a514977da5f8099e7f19366723b89785c9d9897138500eac7281a97d3ea3365acb08f17edb0a71ffe3a63d631987aaf39aa6e0058290f037e9dc SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0
 EBUILD tilda-0.9.6-r1.ebuild 733 BLAKE2B 2a90d0c6e10d60308e79f7d2e67be41838fd788cdd855c618aea34bd589e9a877f9abd8409557cf891271ac403d160718583b865d572487960e2e21f23007c77 SHA512 2e8f74f654aff6e93f233fea124389cbf9af08ce920c37adea88d461d3b6623d9a6f140e6037ad7f64cf71439b61a8b46909eb352d0bd832819a037f2677a79d
-EBUILD tilda-0.9.6.ebuild 667 BLAKE2B e7afc8555e4b0e973e3ba01ae0cdedf593671d2f832d0dbd981b753f3793eaa35e8c19280f0d7f3ea1c4960d6ce4bb121943e34fbaa51f340f2a43370fe2ced5 SHA512 716a1d992939ac7fd51828d96cef8ca1ee9fc3610e4fd4347ea32aa26ac43e1d84088027d1da96b8b223c78db8d4ad73c960f80aa0ccb001954d66dba4f63b1d
 MISC metadata.xml 218 BLAKE2B 7bf63b20a415707a67ee809f2baa9500a3235d261dbd05955a2079db6f345cb99e7570195dd2ce4e7035375fb08ae20418ab504322443253d588d7a6af47f524 SHA512 d5fe990e82840776a7f0f2442df94c1b7dc7a99ebee9fe9345a73fb364f6e6f3924a95e85135caac1c2a80a5ef2ddbaae3ad0eed96eeba97120b9a4bac08ec54
diff --git a/x11-terms/tilda/tilda-0.9.6.ebuild b/x11-terms/tilda/tilda-0.9.6.ebuild
deleted file mode 100644
index fee09545ab77..000000000000
--- a/x11-terms/tilda/tilda-0.9.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
-HOMEPAGE="http://tilda.sourceforge.net"
-SRC_URI="mirror://sourceforge/tilda/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/vte:0
-	>=dev-libs/glib-2.8.4:2
-	dev-libs/confuse
-	gnome-base/libglade"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.6-gdk_resources.patch
-	epatch "${FILESDIR}"/${PN}-0.9.6-glib-single-include.patch
-}