gentoo resync : 25.08.2018

4 files changed, 65 insertions, 3 deletions

diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index cf748a567ba3..260900860190 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,8 @@
+AUX terminology-1.2.1-use-system-lz4.patch 967 BLAKE2B 666ba19e3b53d1694ee7a08e159526230a62c0485fddf1f184e374babd78577408e1f948ce7a1c40a1073310f4d2f0b30efd5d4c068e0022452b5fca78cd5c7e SHA512 01293434648d3ee82a69c85d47841ba6e1794764acaf7498c56d3755a41b836f4102f3b3906352547fb2d590b954cdc0d07f134249c2c224d46f0dc293cdedab
 DIST terminology-1.1.0.tar.xz 4989512 BLAKE2B b2bcc22a63d25517aa4dd223b914a784d8c4c87ce9d971dff20b9f66b3ff0d2667babc053f3e1923d0bcaa5508902b824302420c0731173c96136d2071400f61 SHA512 ad4ecc6d51a6a124e90eb63d887d5f742500944747b469239366732587510717a227aa41a90089911cf1ac5b289228880619726ae95688de9a92972d554bf95d
+DIST terminology-1.1.1.tar.xz 4989940 BLAKE2B 946476fbe7b0f6c5e15e3d2cd6b90e1f77ace4f25541d2c433ccf45f674a4b498b1b289ff17ae079a38a4cc959075087c99d3230c96df43aaf1c36f427bcc446 SHA512 034f061374462bc4c596ed2fbcbf16b77071459595a86cbacb6f4fd613e93b412ce0c61a77770b919f731a559632e897bc378a9bf6dbe2aaa41d1bca8c50215f
 DIST terminology-1.2.1.tar.xz 4858528 BLAKE2B 953917ed9dac9d17048d19394e6d8b38fd1673bc618cd1ecb596eee7b889f973b5622ef9d3424bc9f94928f44129062a7a4f88cdb2af519b87aeb141661902bc SHA512 8485d38a5426ac0f32b3cb049170bfa015a9f648134973462d72412b291b160f05b6ccfb3ba47115740946c8d87160401d55672a6853027d0cc216bdc7cc659b
 EBUILD terminology-1.1.0.ebuild 600 BLAKE2B 8311f2356fcf22ddce03adfc341dea0a4e0c00ca112a6019c5335c68ebc5b14dfea5f7a77ef38a19f1e39fe7d76c6d348a0dfee9bdea7dfbdb34eedc49327e88 SHA512 c251bcfad8907496aead3efb018fb65c2beb7e220839ac1cf596033a6220c6d44cc3da6edcfa1f8dff75e3d1be6cb2ab6837b9ec60487e00d04fa8cb57fa4258
-EBUILD terminology-1.2.1.ebuild 712 BLAKE2B 250af7a050ca90d1307f3ce14eb43aae5febc08ed0e0c1df49375eb7e07e4a0cbb16f395ff5a14b6d8fc5c785d7d93a07c8beceec9c130d13b96e147849488a3 SHA512 b017808606664725dd5ed5174c810597b00dc4c9d312a9f9c9a780d5effb0e213768498ad92eda28405ef11cf998e729f0c6b68195e31887ab0d3ae1c9469fef
+EBUILD terminology-1.1.1.ebuild 602 BLAKE2B daed42e72d45ddd35f72131044aeb743f743060cf544d9d21cc088316f887544e8618910e9d8dfe4bb169dc73ff7573fd90ccb9167af0597088d04347a1e4533 SHA512 0bfb90b43e76475d8b6e6c1c3388ea5c3915a558cc49057d751da1a10815a88a29c0000fc4c2d0cf4dcf43602f0e4f146551644a0fcc89f1218b44c02a859d8f
+EBUILD terminology-1.2.1-r1.ebuild 879 BLAKE2B 1ace436b35bd8a12291ba6e9c74ac82cb20ec579654469bfb957b97926c202e9444e54a39627888221cd726884321c5e9c977fc3f9b282177a88748fca0e5878 SHA512 2eb432498832d29224fc8d48110d385f9bf028275375de00a0c8a109b2af54182f85e52eada55fcf88e2b595a9860ec4e672977401df45b831d1337e660a80dc
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/x11-terms/terminology/files/terminology-1.2.1-use-system-lz4.patch b/x11-terms/terminology/files/terminology-1.2.1-use-system-lz4.patch
new file mode 100644
index 000000000000..291312dc4863
--- /dev/null
+++ b/x11-terms/terminology/files/terminology-1.2.1-use-system-lz4.patch
@@ -0,0 +1,23 @@
+diff -Naur a/src/bin/meson.build b/src/bin/meson.build
+--- a/src/bin/meson.build	2018-05-14 23:20:41.000000000 +0300
++++ b/src/bin/meson.build	2018-08-14 15:45:56.349694832 +0300
+@@ -31,7 +31,6 @@
+                        'termptygfx.c', 'termptygfx.h',
+                        'termptyext.c', 'termptyext.h',
+                        'termptysave.c', 'termptysave.h',
+-                       'lz4/lz4.c', 'lz4/lz4.h',
+                        'md5/md5.c', 'md5/md5.h',
+                        'utf8.c', 'utf8.h',
+                        'win.c', 'win.h',
+diff -Naur a/src/bin/termptysave.c b/src/bin/termptysave.c
+--- a/src/bin/termptysave.c	2018-05-14 23:20:41.000000000 +0300
++++ b/src/bin/termptysave.c	2018-08-14 16:08:59.050328377 +0300
+@@ -2,7 +2,7 @@
+ #include <Elementary.h>
+ #include "termpty.h"
+ #include "termptysave.h"
+-#include "lz4/lz4.h"
++#include <lz4.h>
+ #include <sys/mman.h>
+ 
+ #if defined (__MacOSX__) || (defined (__MACH__) && defined (__APPLE__))
diff --git a/x11-terms/terminology/terminology-1.1.1.ebuild b/x11-terms/terminology/terminology-1.1.1.ebuild
new file mode 100644
index 000000000000..e1f570eea6a3
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="nls"
+
+RDEPEND=">=dev-libs/efl-1.18.0[eet,X]"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable nls)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/x11-terms/terminology/terminology-1.2.1.ebuild b/x11-terms/terminology/terminology-1.2.1-r1.ebuild
index 60c5acbbd7e9..5090a3366749 100644
--- a/x11-terms/terminology/terminology-1.2.1.ebuild
+++ b/x11-terms/terminology/terminology-1.2.1-r1.ebuild
@@ -14,16 +14,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="nls"
 
-RDEPEND=">=dev-libs/efl-1.20.0[eet,fontconfig,opengl,X]"
+RDEPEND="
+	|| ( dev-libs/efl[egl] dev-libs/efl[opengl] )
+	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	>=dev-libs/efl-1.20.0[eet,fontconfig]
+"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+	"${FILESDIR}/terminology-1.2.1-use-system-lz4.patch"
+)
+
 src_prepare() {
 	default
-
 	xdg_environment_reset
 }