gentoo resync : 16.06.2018

6 files changed, 52 insertions, 13 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 0aa9d673e5d8..04d1d888520a 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 7b9bc363ceac..5065a1e410cf 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,8 +1,9 @@
 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.1.0.tar.xz 4989512 BLAKE2B b2bcc22a63d25517aa4dd223b914a784d8c4c87ce9d971dff20b9f66b3ff0d2667babc053f3e1923d0bcaa5508902b824302420c0731173c96136d2071400f61 SHA512 ad4ecc6d51a6a124e90eb63d887d5f742500944747b469239366732587510717a227aa41a90089911cf1ac5b289228880619726ae95688de9a92972d554bf95d
 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.1.0.ebuild 590 BLAKE2B 4ddcdd394271b08f0c573194607f6407c9c0adbbc69c77bc9bcb981931f1a405cb81bbbfc8533f541351573a0ba378e557830fe76da5ab0490cc3b9caee14bd9 SHA512 54a911125afdf4eea4ba6d0c55b5609f7cc10d1fcd9c5f6e6447d69f50e6b9fd750a14f6fc07d700644ab0f04ffb37b15ebfa6bee6cefd4591f7505e51325778
 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-9999.ebuild b/x11-terms/terminology/terminology-1.1.0.ebuild
index b8b33368f9b5..ddf20a904f22 100644
--- a/x11-terms/terminology/terminology-9999.ebuild
+++ b/x11-terms/terminology/terminology-1.1.0.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-
-inherit git-r3 meson
+EAPI=7
 
 DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
 HOMEPAGE="https://www.enlightenment.org/about-terminology"
-EGIT_REPO_URI="https://git.enlightenment.org/apps/${PN}.git"
+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]"
+RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
@@ -21,9 +20,9 @@ DEPEND="
 "
 
 src_configure() {
-	local emesonargs=(
-		-D nls=$(usex nls true false)
+	local myconf=(
+		$(use_enable nls)
 	)
 
-	meson_src_configure
+	econf "${myconf[@]}"
 }
diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 5efb3af0c6f1..99b77320d589 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -2,5 +2,7 @@ AUX tilda-0.9.6-gdk_resources.patch 556 BLAKE2B f0d461e63577b0693a2ef5e393130ac2
 AUX tilda-0.9.6-glib-single-include.patch 204 BLAKE2B 8ee254da128ef666684fc6cdd35a57d12c8f8015f26918ae022973babad6be3c9dc4d884832087a4bb972f0db8042890db054792c40fc9c27cd9ce3cc66f1f37 SHA512 ef932dec3986a552488719e05cb1b38459ba6fd37135a0c98855bcf22ae44225d7ef8469bdd83d391d664179e8965580734052d27fcb895f52b9f3bb07ee9f05
 AUX tilda-0.9.6-makefile.patch 689 BLAKE2B d2132b3567d9bfdf9301184c73e5ba5f7add927f7d3d865473d8ebbda7e2d89aeb3ffa99cab95ecb96ea70f57cb874be1fe8badf4c90bb15f28d49113585cfeb SHA512 45ee0e4eb3ec9a62c5fd1b607fd548141738528bf4c82254a68b81baca1c52f10af81ca5c8450ea3dd6af6709d5e11e0d1d7bb7b6a77b88cf1c169677be1b7ed
 DIST tilda-0.9.6.tar.gz 307517 BLAKE2B dba49f28cf92a514977da5f8099e7f19366723b89785c9d9897138500eac7281a97d3ea3365acb08f17edb0a71ffe3a63d631987aaf39aa6e0058290f037e9dc SHA512 7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0
+DIST tilda-1.4.1.tar.gz 471340 BLAKE2B a84d125bf81e384706347401ebbf7b11813bf5ed422e6b374e918ed564b9bfe168ebf3fef163b91a15350b49166b0040e90afdef716cc1762ecc410710f72c29 SHA512 d16878e762d94f94c219e8e711223a771a2ab816f02573f693cfbcfa0eee5aafff8a274898a65df168c0bf78258aa16e5a3be6b0c3dee418af61c68f43ed74c6
 EBUILD tilda-0.9.6-r1.ebuild 733 BLAKE2B 2a90d0c6e10d60308e79f7d2e67be41838fd788cdd855c618aea34bd589e9a877f9abd8409557cf891271ac403d160718583b865d572487960e2e21f23007c77 SHA512 2e8f74f654aff6e93f233fea124389cbf9af08ce920c37adea88d461d3b6623d9a6f140e6037ad7f64cf71439b61a8b46909eb352d0bd832819a037f2677a79d
-MISC metadata.xml 218 BLAKE2B 7bf63b20a415707a67ee809f2baa9500a3235d261dbd05955a2079db6f345cb99e7570195dd2ce4e7035375fb08ae20418ab504322443253d588d7a6af47f524 SHA512 d5fe990e82840776a7f0f2442df94c1b7dc7a99ebee9fe9345a73fb364f6e6f3924a95e85135caac1c2a80a5ef2ddbaae3ad0eed96eeba97120b9a4bac08ec54
+EBUILD tilda-1.4.1.ebuild 717 BLAKE2B bb125bde5f07a6dd52c6fcd907566b5a492fae9e04c344115578fc1a8817665fd76a2423567ae9888d654dd6e42940c23fd41a99f1264bebf16451da6054c8c5 SHA512 36a6e6c9e0307bf2f0dc6e7a2b0a41a46d4e7c8bb8c2e9f2d655d6f63b06e5cc95be32f95deaeffc36dbe9e2b2a2c3577395e7c8301f015d05b52a60c74d857d
+MISC metadata.xml 319 BLAKE2B 69510b8b8d8658d9cc6884a960bd6b2511da1ae40e771c1edcfa836b0f1033bd4b66d5cbdb3d664108d90d0afa77de6caacb42f8f0bed5d9f8c88abeb34463d4 SHA512 013ac97bba6505168215a97c531a4fcac607b678aaf804ffdfb44611b61e930709621bedd71f7fbea06b25f8bd7000530f878cf57c419c9938afd61155ff060a
diff --git a/x11-terms/tilda/metadata.xml b/x11-terms/tilda/metadata.xml
index 31619dab2778..ed2ff48b937b 100644
--- a/x11-terms/tilda/metadata.xml
+++ b/x11-terms/tilda/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="sourceforge">tilda</remote-id>
-  </upstream>
+	<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+	</maintainer>
+	<upstream>
+	<remote-id type="sourceforge">tilda</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-terms/tilda/tilda-1.4.1.ebuild b/x11-terms/tilda/tilda-1.4.1.ebuild
new file mode 100644
index 000000000000..1900b21ec9f0
--- /dev/null
+++ b/x11-terms/tilda/tilda-1.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A drop down terminal, similar to the consoles found in first person shooters"
+HOMEPAGE="https://github.com/lanoxx/tilda"
+SRC_URI="https://github.com/lanoxx/tilda/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/vte:2.91
+	>=dev-libs/glib-2.8.4:2
+	dev-libs/confuse
+	gnome-base/libglade
+	x11-libs/gtk+:3
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	append-cflags -std=c99
+	eautoreconf
+}