gentoo resync : 22.04.2018

4 files changed, 15 insertions, 15 deletions

diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index e6a18cb2cbae..5510201dc3e7 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,7 +1,7 @@
-AUX tilda-0.9.6-gdk_resources.patch 624 BLAKE2B 73770f00afc0e1975cc0c6f71b8c51f37f1efffc4e55ef33251838e7b98d3f604daae09ff6796ff49ca8864037ebf29e6dbe6fdded0fff9ae4b2c3d61d962ccb SHA512 c32268a172c97551debcf9c5b57159546b5657f6726998bd6fadeeab1ae6a2e05d1efdfd1f61cae5f0d0972e3ac8c4d2b7409aaac31df921c417c99e22af9fcd
-AUX tilda-0.9.6-glib-single-include.patch 338 BLAKE2B 18b2b8412eab9bd15720b920b72abc4d7778cb6844f4f8717a400f8432b298073741558f7152193a8588bde4a56827d239421799c1b1b11a590b3ae1973238fb SHA512 e161ac8d6ac2e645efcdbed7247baff2a360128a7c5dff3aa9ecf4fcfe0c8e05bab2276fbe5970674f4b59385515e4c9aaaab5619687e41c1ab9390d34b93500
+AUX tilda-0.9.6-gdk_resources.patch 556 BLAKE2B f0d461e63577b0693a2ef5e393130ac28f8aba7898ffe82c98b5b0e1acb65a408a06798c87116b52c0c417d2611592e8c3692b3fa9245a015335559ab09f1758 SHA512 d799db69f9fd4c272621ba37f77b7b969f35468ea26651750b2e21e30c3763a2ff9f419bd4a66321e11d6d9f50f9e77f46b26d7852e2cec408ee24f7c2d89af1
+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
-EBUILD tilda-0.9.6-r1.ebuild 754 BLAKE2B 1698211d414d153a7d0db8718dceaaa73241e6fc424241cc5455773cd0ba2e18c684394d9f314d007469ed24e3d51d923afef48fe671a1c73fd2977ef1fb6c90 SHA512 557d62c256b05900f960e48a8d40d6663bf8067243d1a344c6e50b9a9a4341f0984286e9c377dbd159a8d8c40ae180c471c80c3f90b4282699607d6b2872137c
+EBUILD tilda-0.9.6-r1.ebuild 734 BLAKE2B 5fca14afc5adba2b0bdf21ec1cd2f3d2e32a866d0c4904319e8da81f5964c96ec520f930406219c3b96fc86ef5aa3f2172cc3075c1efbff60a6f6494f8c3a15d SHA512 814128f786cbb8e445505eda34fc5a66599d58b2dfa3b28c24bfa7a85f1e4b0c6d2694d9d628acb755c9e3253d9e12e4cdedb4533ae28bf31e9d238c7871d091
 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/files/tilda-0.9.6-gdk_resources.patch b/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
index a26ba91f5ec0..3f5b763c1bd4 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 fcc734f771d9..00eb5bd3be09 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 ed11fc466333..128a4518d15a 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
 }