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

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

[Akinori Hattori]

commit:     6b9ff2f5d621c6592ce56414ac778e5d0f897832
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 14:49:17 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 14:50:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b9ff2f5

app-i18n/anthy: update patch

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/anthy/anthy-9100h-r1.ebuild                   |  2 +-
 app-i18n/anthy/anthy-9100h-r2.ebuild                   |  2 +-
 app-i18n/anthy/files/anthy-9100h-anthy_context_t.patch | 12 ------------
 app-i18n/anthy/files/anthy-anthy_context_t.patch       | 11 +++++++++++
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app-i18n/anthy/anthy-9100h-r1.ebuild b/app-i18n/anthy/anthy-9100h-r1.ebuild
index 1a3713f2605..2f19573106f 100644
--- a/app-i18n/anthy/anthy-9100h-r1.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-anthy_context_t.patch"
+	epatch "${FILESDIR}"/${PN}-anthy_context_t.patch
 
 	if use canna-2ch; then
 		einfo "Adding nichan.ctd to anthy.dic."

diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index 1d96fbfc15c..7b639dd7214 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
 	emacs? ( virtual/emacs )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-anthy_context_t.patch )
+PATCHES=( "${FILESDIR}"/${PN}-anthy_context_t.patch )
 DOCS=( AUTHORS ChangeLog DIARY NEWS README )
 
 SITEFILE="50${PN}-gentoo.el"

diff --git a/app-i18n/anthy/files/anthy-9100h-anthy_context_t.patch b/app-i18n/anthy/files/anthy-9100h-anthy_context_t.patch
deleted file mode 100644
index b46a136663b..00000000000
--- a/app-i18n/anthy/files/anthy-9100h-anthy_context_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur anthy-9100h.orig/anthy/input.h anthy-9100h/anthy/input.h
---- anthy-9100h.orig/anthy/input.h	2006-05-13 18:28:35.000000000 +0900
-+++ anthy-9100h/anthy/input.h	2011-01-12 23:36:39.629749518 +0900
-@@ -10,6 +10,8 @@
- #ifndef INPUT_H_INCLUDE
- #define INPUT_H_INCLUDE
- 
-+#include "anthy.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif

diff --git a/app-i18n/anthy/files/anthy-anthy_context_t.patch b/app-i18n/anthy/files/anthy-anthy_context_t.patch
new file mode 100644
index 00000000000..aab4ab749ea
--- /dev/null
+++ b/app-i18n/anthy/files/anthy-anthy_context_t.patch
@@ -0,0 +1,11 @@
+--- a/anthy/input.h
++++ b/anthy/input.h
+@@ -10,6 +10,8 @@
+ #ifndef INPUT_H_INCLUDE
+ #define INPUT_H_INCLUDE
+ 
++#include "anthy.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif