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

2018-11-17 Thread Mikle Kolyada
commit: 367d28b080303ca93d4122d67681a6a9acd61128
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Nov 17 13:01:38 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Nov 17 13:01:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367d28b0

x11-terms/tilda: Drop old

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 x11-terms/tilda/Manifest   |  1 -
 .../tilda/files/tilda-0.9.6-gdk_resources.patch| 12 
 .../files/tilda-0.9.6-glib-single-include.patch| 11 
 x11-terms/tilda/files/tilda-0.9.6-makefile.patch   | 24 
 x11-terms/tilda/tilda-0.9.6-r1.ebuild  | 33 --
 5 files changed, 81 deletions(-)

diff --git a/x11-terms/tilda/Manifest b/x11-terms/tilda/Manifest
index 35cd826bf93..75d1352d0e3 100644
--- a/x11-terms/tilda/Manifest
+++ b/x11-terms/tilda/Manifest
@@ -1,2 +1 @@
-DIST tilda-0.9.6.tar.gz 307517 BLAKE2B 
dba49f28cf92a514977da5f8099e7f19366723b89785c9d9897138500eac7281a97d3ea3365acb08f17edb0a71ffe3a63d631987aaf39aa6e0058290f037e9dc
 SHA512 
7d0ddaf289de2c3f9f48f5cce3ee71534b9fdd91f79a4e56a32a301fd8fc82c4a3d760cfcd16d8d2e2d9f0d963b8130547720563ab15c2bb2220ff546ea562b0
 DIST tilda-1.4.1.tar.gz 471340 BLAKE2B 
a84d125bf81e384706347401ebbf7b11813bf5ed422e6b374e918ed564b9bfe168ebf3fef163b91a15350b49166b0040e90afdef716cc1762ecc410710f72c29
 SHA512 
d16878e762d94f94c219e8e711223a771a2ab816f02573f693cfbcfa0eee5aafff8a274898a65df168c0bf78258aa16e5a3be6b0c3dee418af61c68f43ed74c6

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
deleted file mode 100644
index 3f5b763c1bd..000
--- a/x11-terms/tilda/files/tilda-0.9.6-gdk_resources.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 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"));
- gtk_window_resize (GTK_WINDOW(tw->window), config_getint ("max_width"), 
config_getint ("max_height"));
-+/* Create GDK resources now, to prevent crashes later on */
-+gtk_widget_realize (tw->window);
-+
- generate_animation_positions (tw);
- 
- return tw;

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
deleted file mode 100644
index 00eb5bd3be0..000
--- a/x11-terms/tilda/files/tilda-0.9.6-glib-single-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/src/tomboykeybinder.h
-+++ b/src/tomboykeybinder.h
-@@ -2,7 +2,7 @@
- #ifndef __TOMBOY_KEY_BINDER_H__
- #define __TOMBOY_KEY_BINDER_H__
- 
--#include 
-+#include 
- 
- G_BEGIN_DECLS
- 

diff --git a/x11-terms/tilda/files/tilda-0.9.6-makefile.patch 
b/x11-terms/tilda/files/tilda-0.9.6-makefile.patch
deleted file mode 100644
index cfb86fd0c52..000
--- a/x11-terms/tilda/files/tilda-0.9.6-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6ee8cb9e2d19b7b1e7b80f5f26557aaac1a91151 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping 
-Date: Tue, 14 Mar 2017 01:40:28 +0100
-Subject: [PATCH] Make .desktop file use actual icon location
-

- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0378052..074837b 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -27,6 +27,6 @@ EXTRA_DIST = tilda.desktop.in tilda.png tilda.glade
- 
- tilda.desktop: tilda.desktop.in
-   sed -e 's|\@BINDIR\@|$(bindir)|' \
--  -e 's|\@PIXMAPSDIR\@|$(datadir)/applications|' $< > $@
-+  -e 's|\@PIXMAPSDIR\@|$(Pixmapsdir)|' $< > $@
- 
- ACLOCAL_AMFLAGS = -I m4
--- 
-2.12.0
-

diff --git a/x11-terms/tilda/tilda-0.9.6-r1.ebuild 
b/x11-terms/tilda/tilda-0.9.6-r1.ebuild
deleted file mode 100644
index e06cb71f346..000
--- a/x11-terms/tilda/tilda-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A drop down terminal, similar to the consoles found in first 
person shooters"
-HOMEPAGE="http://tilda.sourceforge.net;
-SRC_URI="mirror://sourceforge/tilda/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="x11-libs/vte:0
-   >=dev-libs/glib-2.8.4:2
-   dev-libs/confuse
-   gnome-base/libglade"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-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
-}



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

2018-04-20 Thread David Seifert
commit: f36ddf8c5fc95e01584474a508feb8a7d1004334
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Apr 20 09:32:46 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 20 20:01:13 2018 +
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.0 +0100
-+++ src/tilda_window.c 2010-03-19 22:30:31.0 +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
 }