summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2017-08-23 23:36:59 +0900
committerAkinori Hattori <hattya@gentoo.org>2017-08-23 23:49:30 +0900
commitd98d704170315372b7c613096b286729e413e8b4 (patch)
tree55275e302a76f8e2ada78800669e28c4f8ef5f84 /app-i18n/pyzy
parentapp-vim/command-t: version bump to 5.0.1 (diff)
downloadgentoo-d98d704170315372b7c613096b286729e413e8b4.tar.gz
gentoo-d98d704170315372b7c613096b286729e413e8b4.tar.bz2
gentoo-d98d704170315372b7c613096b286729e413e8b4.zip
app-i18n/pyzy: update patches
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'app-i18n/pyzy')
-rw-r--r--app-i18n/pyzy/files/pyzy-db.patch17
-rw-r--r--app-i18n/pyzy/files/pyzy-dont-download-dictionary-file.patch15
-rw-r--r--app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch (renamed from app-i18n/pyzy/files/pyzy-support-opencc-1.0.0.patch)15
-rw-r--r--app-i18n/pyzy/pyzy-0.1.0-r2.ebuild6
4 files changed, 31 insertions, 22 deletions
diff --git a/app-i18n/pyzy/files/pyzy-db.patch b/app-i18n/pyzy/files/pyzy-db.patch
new file mode 100644
index 000000000000..44d0ac6bf456
--- /dev/null
+++ b/app-i18n/pyzy/files/pyzy-db.patch
@@ -0,0 +1,17 @@
+--- a/data/db/open-phrase/Makefile.am
++++ b/data/db/open-phrase/Makefile.am
+@@ -30,13 +30,10 @@
+ DBTAR = pyzy-database-$(DBVER).tar.bz2
+
+ $(DBTAR):
+- $(AM_V_GEN) \
+- wget http://pyzy.googlecode.com/files/$(DBTAR) || \
+- ( $(RM) $@; exit 1)
++ touch $@
+
+ stamp-db: $(DBTAR)
+ $(AM_V_GEN) \
+- tar jxfm $(DBTAR); \
+ mv db/main.db db/$(db_file); \
+ touch $@
+
diff --git a/app-i18n/pyzy/files/pyzy-dont-download-dictionary-file.patch b/app-i18n/pyzy/files/pyzy-dont-download-dictionary-file.patch
deleted file mode 100644
index 1b6dca68d695..000000000000
--- a/app-i18n/pyzy/files/pyzy-dont-download-dictionary-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't download database file on make phrase.
-The database file will be downloaded by ebuild script instead.
-diff -urN pyzy-0.1.0.orig/data/db/open-phrase/Makefile.am pyzy-0.1.0/data/db/open-phrase/Makefile.am
---- pyzy-0.1.0.orig/data/db/open-phrase/Makefile.am 2012-09-05 13:23:24.151736716 +0900
-+++ pyzy-0.1.0/data/db/open-phrase/Makefile.am 2012-09-05 14:18:57.144553548 +0900
-@@ -30,9 +30,6 @@
- DBTAR = pyzy-database-$(DBVER).tar.bz2
-
- $(DBTAR):
-- $(AM_V_GEN) \
-- wget http://pyzy.googlecode.com/files/$(DBTAR) || \
-- ( $(RM) $@; exit 1)
-
- stamp-db: $(DBTAR)
- $(AM_V_GEN) \
diff --git a/app-i18n/pyzy/files/pyzy-support-opencc-1.0.0.patch b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
index 055aad13ca1c..1e23e8b6e5db 100644
--- a/app-i18n/pyzy/files/pyzy-support-opencc-1.0.0.patch
+++ b/app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
@@ -1,10 +1,17 @@
-commit 344872231b95ce7c2808288101cc563dcd011940
-Author: Hillwood Yang <hillwoodroc@gmail.com>
-Date: Thu Feb 26 11:04:29 2015 +0800
+https://github.com/pyzy/pyzy/pull/1
+
+Author: Hillwood Yang <hillwood@opensuse.org>
-diff -urN a/src/SimpTradConverter.cc b/src/SimpTradConverter.cc
--- a/src/SimpTradConverter.cc
+++ b/src/SimpTradConverter.cc
+@@ -4,6 +4,7 @@
+ *
+ * Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (c) 2010 BYVoid <byvoid1@gmail.com>
++ * Copyright (c) 2015 Hillwood Yang <hillwood@opensuse.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
@@ -40,7 +41,6 @@ namespace PyZy {
#ifdef HAVE_OPENCC
diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
index 0ebc4cfdf327..982a943fe1c1 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -31,8 +31,8 @@ DEPEND="${RDEPEND}
RESTRICT="test"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-dont-download-dictionary-file.patch
- epatch "${FILESDIR}"/${PN}-support-opencc-1.0.0.patch
+ epatch "${FILESDIR}"/${PN}-db.patch
+ epatch "${FILESDIR}"/${PN}-opencc-1.0.0.patch
mv ../db ./data/db/open-phrase/ || die
eautoreconf