[gentoo-commits] repo/gentoo:master commit in: x11-terms/tilda/files/, x11-terms/tilda/

[David Seifert]

commit:     f36ddf8c5fc95e01584474a508feb8a7d1004334
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 20 09:32:46 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 20:01:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36ddf8c

x11-terms/tilda: epatch->PATCHES=()

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch      |  4 ++--
 .../tilda/files/tilda-0.9.6-glib-single-include.patch      |  6 ++----
 x11-terms/tilda/tilda-0.9.6-r1.ebuild                      | 14 ++++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch 
b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
index a26ba91f5ec..3f5b763c1bd 100644
--- a/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
+++ b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
@@ -1,5 +1,5 @@
---- src/tilda_window.c 2008-01-17 23:07:39.000000000 +0100
-+++ src/tilda_window.c 2010-03-19 22:30:31.000000000 +0100
+--- a/src/tilda_window.c
++++ b/src/tilda_window.c
 @@ -427,6 +427,9 @@
      gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), 
config_getint ("y_pos"));
      gtk_window_set_default_size (GTK_WINDOW(tw->window), config_getint 
("max_width"), config_getint ("max_height"));

diff --git a/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch 
b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
index fcc734f771d..00eb5bd3be0 100644
--- a/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
+++ b/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
@@ -1,7 +1,5 @@
-Index: tilda-0.9.6/src/tomboykeybinder.h
-===================================================================
---- tilda-0.9.6.orig/src/tomboykeybinder.h
-+++ tilda-0.9.6/src/tomboykeybinder.h
+--- a/src/tomboykeybinder.h
++++ b/src/tomboykeybinder.h
 @@ -2,7 +2,7 @@
  #ifndef __TOMBOY_KEY_BINDER_H__
  #define __TOMBOY_KEY_BINDER_H__

diff --git a/x11-terms/tilda/tilda-0.9.6-r1.ebuild 
b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
index ed11fc46633..128a4518d15 100644
--- a/x11-terms/tilda/tilda-0.9.6-r1.ebuild
+++ b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A drop down terminal, similar to the consoles found in first 
person shooters"
 HOMEPAGE="http://tilda.sourceforge.net";
@@ -21,11 +21,13 @@ RDEPEND="x11-libs/vte:0
 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
-       epatch "${FILESDIR}"/${PN}-0.9.6-makefile.patch
-       eapply_user
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.9.6-gdk_resources.patch
+       "${FILESDIR}"/${PN}-0.9.6-glib-single-include.patch
+       "${FILESDIR}"/${PN}-0.9.6-makefile.patch
+)
 
+src_prepare() {
+       default
        eautoreconf
 }