commit:     3cae7548ab26be51201675c67335fa281d38ca30
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Sat Nov 24 08:13:19 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec  4 22:53:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cae7548

x11-terms/terminology: remove old 1.2.1-r1.

- remove lz4 patch, fixed upstream for 1.3.0

Signed-off-by: Joonas Niilola <juippis <AT> gmail.com>
Package-Manager: Portage[mgorny]-2.3.49.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 x11-terms/terminology/Manifest                     |  1 -
 .../files/terminology-1.2.1-use-system-lz4.patch   | 23 -----------
 x11-terms/terminology/terminology-1.2.1-r1.ebuild  | 44 ----------------------
 3 files changed, 68 deletions(-)

diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 82b1f1f5b67..bc204e7bb70 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,3 +1,2 @@
 DIST terminology-1.1.1.tar.xz 4989940 BLAKE2B 
946476fbe7b0f6c5e15e3d2cd6b90e1f77ace4f25541d2c433ccf45f674a4b498b1b289ff17ae079a38a4cc959075087c99d3230c96df43aaf1c36f427bcc446
 SHA512 
034f061374462bc4c596ed2fbcbf16b77071459595a86cbacb6f4fd613e93b412ce0c61a77770b919f731a559632e897bc378a9bf6dbe2aaa41d1bca8c50215f
-DIST terminology-1.2.1.tar.xz 4858528 BLAKE2B 
953917ed9dac9d17048d19394e6d8b38fd1673bc618cd1ecb596eee7b889f973b5622ef9d3424bc9f94928f44129062a7a4f88cdb2af519b87aeb141661902bc
 SHA512 
8485d38a5426ac0f32b3cb049170bfa015a9f648134973462d72412b291b160f05b6ccfb3ba47115740946c8d87160401d55672a6853027d0cc216bdc7cc659b
 DIST terminology-1.3.0.tar.xz 4849268 BLAKE2B 
6765838d54273cc726684b477effaedfd7ac1be5474b71609d5890ad87ef02edd662dab5d794572547cb130d1a95f1d16f9a7458a82da2f00a8d72646b416ad8
 SHA512 
ac8b9dee8167365c7127cb01a0511a1aacfd28926b950142052998f2d33e86a3c80024408d3053e4e7f7047455153f3c8fdf23b329faec0313c42005e6213f50

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
deleted file mode 100644
index 291312dc486..00000000000
--- a/x11-terms/terminology/files/terminology-1.2.1-use-system-lz4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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.2.1-r1.ebuild 
b/x11-terms/terminology/terminology-1.2.1-r1.ebuild
deleted file mode 100644
index 5090a336674..00000000000
--- a/x11-terms/terminology/terminology-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="nls"
-
-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
-}
-
-src_configure() {
-       local emesonargs=(
-               -D nls=$(usex nls true false)
-       )
-
-       meson_src_configure
-}

Reply via email to