[gentoo-commits] repo/gentoo:master commit in: app-i18n/jfbterm/files/, app-i18n/jfbterm/

[Akinori Hattori]

commit:     98a04d17c51d43f158eb6f1c77db86f8f390b4d9
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 14:08:17 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 14:13:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98a04d17

app-i18n/jfbterm: update patches

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 ...bterm-0.4.7-gentoo.patch => jfbterm-gentoo.patch} | 20 ++++++++------------
 ...headers.patch => jfbterm-no-kernel-headers.patch} |  4 ++--
 ...hld-debian.patch => jfbterm-sigchld-debian.patch} |  8 ++++----
 ...ne-gcc5.patch => jfbterm-wrong-inline-gcc5.patch} | 10 +++++-----
 app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild             | 10 +++++-----
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-gentoo.patch
similarity index 89%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
rename to app-i18n/jfbterm/files/jfbterm-gentoo.patch
index 8dc8bc097b0..48286aa8b22 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch
+++ b/app-i18n/jfbterm/files/jfbterm-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
---- jfbterm-0.4.7.orig/fbcommon.c	2003-09-03 00:23:17.000000000 +0900
-+++ jfbterm-0.4.7/fbcommon.c	2007-08-18 10:55:30.000000000 +0900
+--- a/fbcommon.c
++++ b/fbcommon.c
 @@ -46,7 +46,6 @@
  #endif
  #include <linux/vt.h>
@@ -19,9 +18,8 @@ diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c
  		close(fd);
  		snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer);
  	}
-diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample
---- jfbterm-0.4.7.orig/jfbterm.conf.sample	2003-09-16 00:16:35.000000000 +0900
-+++ jfbterm-0.4.7/jfbterm.conf.sample	2007-08-18 10:19:00.000000000 +0900
+--- a/jfbterm.conf.sample
++++ b/jfbterm.conf.sample
 @@ -19,29 +19,29 @@
  #	Absolute path or relative path to PWD
  #
@@ -71,9 +69,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sam
  
  
  ###############################################################################
-diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja
---- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja	2003-09-16 00:16:35.000000000 +0900
-+++ jfbterm-0.4.7/jfbterm.conf.sample.ja	2007-08-18 10:19:11.000000000 +0900
+--- a/jfbterm.conf.sample.ja
++++ b/jfbterm.conf.sample.ja
 @@ -25,29 +25,29 @@
  #	絶対パス or PWDからの相対パス
  #
@@ -123,9 +120,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.
  
  ################################################################################
  #
-diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h
---- jfbterm-0.4.7.orig/util.h	2003-09-16 00:45:31.000000000 +0900
-+++ jfbterm-0.4.7/util.h	2007-08-18 08:48:49.000000000 +0900
+--- a/util.h
++++ b/util.h
 @@ -31,6 +31,7 @@
  
  #include <sys/types.h>

diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
similarity index 74%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
rename to app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
index 06c6e603348..aa0b39ed269 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch
+++ b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch
@@ -3,8 +3,8 @@ Patch by Shunichi Fuji <palgowr@×××××.com>.
 
 See bug #156306
 
---- jfbterm-0.4.7.orig/fbdpsp.c	2003-08-30 03:48:16.000000000 +0900
-+++ jfbterm-0.4.7/fbdpsp.c	2006-11-27 01:22:20.000000000 +0900
+--- a/fbdpsp.c
++++ b/fbdpsp.c
 @@ -827,8 +827,7 @@
  
  #ifdef JFB_VGA16FB

diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
similarity index 75%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
rename to app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
index 2e803640077..60deee49422 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch
+++ b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch
@@ -1,5 +1,5 @@
---- jfbterm-0.4.7.orig/main.c
-+++ jfbterm-0.4.7/main.c
+--- a/main.c
++++ b/main.c
 @@ -184,7 +184,7 @@
  	p->gExecShellArgv = NULL;
  	p->gConfFile = FILE_JFBTERM_CONF;
@@ -9,8 +9,8 @@
  	atexit(tapp_final_at_exit);
  }
  
---- jfbterm-0.4.7.orig/term.h
-+++ jfbterm-0.4.7/term.h
+--- a/term.h
++++ b/term.h
 @@ -44,7 +44,7 @@
  } TTerm;
  

diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
similarity index 54%
rename from app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
rename to app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
index 974ccbc4130..aa41d5e02ce 100644
--- a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch
+++ b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch
@@ -1,7 +1,7 @@
-Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch
+https://src.fedoraproject.org/rpms/jfbterm/blob/rawhide/f/jfbterm-0.4.7-wrong-inline-gcc5.patch
 
---- jfbterm-0.4.7/pen.c.inline_gcc5	2003-08-30 03:48:16.000000000 +0900
-+++ jfbterm-0.4.7/pen.c	2015-02-09 10:36:47.182751545 +0900
+--- a/pen.c
++++ b/pen.c
 @@ -62,7 +62,7 @@
  	p->attr = q->attr;
  }
@@ -11,8 +11,8 @@ Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-
  {
  	p->bcol = 0;
  	p->fcol = 7;
---- jfbterm-0.4.7/pen.h.inline_gcc5	2002-07-17 01:21:23.000000000 +0900
-+++ jfbterm-0.4.7/pen.h	2015-02-09 10:36:52.058705503 +0900
+--- a/pen.h
++++ b/pen.h
 @@ -58,7 +58,7 @@
  void tpen_init(TPen* p);
  void tpen_final(TPen* p);

diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
index 93989a66a5a..70443ef74fd 100644
--- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
+++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,10 +21,10 @@ RDEPEND="
 	media-fonts/intlfonts"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-sigchld-debian.patch
-	"${FILESDIR}"/${P}-no-kernel-headers.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-wrong-inline-gcc5.patch
+	"${FILESDIR}"/${PN}-sigchld-debian.patch
+	"${FILESDIR}"/${PN}-no-kernel-headers.patch
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-wrong-inline-gcc5.patch
 )
 
 src_prepare() {