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

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

[Akinori Hattori]

commit:     d98d704170315372b7c613096b286729e413e8b4
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 14:36:59 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 14:49:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d98d7041

app-i18n/pyzy: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/pyzy/files/pyzy-db.patch                       | 17 +++++++++++++++++
 .../pyzy/files/pyzy-dont-download-dictionary-file.patch | 15 ---------------
 ...pport-opencc-1.0.0.patch => pyzy-opencc-1.0.0.patch} | 15 +++++++++++----
 app-i18n/pyzy/pyzy-0.1.0-r2.ebuild                      |  6 +++---
 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 00000000000..44d0ac6bf45
--- /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 1b6dca68d69..00000000000
--- 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
similarity index 75%
rename from app-i18n/pyzy/files/pyzy-support-opencc-1.0.0.patch
rename to app-i18n/pyzy/files/pyzy-opencc-1.0.0.patch
index 055aad13ca1..1e23e8b6e5d 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 0ebc4cfdf32..982a943fe1c 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

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

[Akinori Hattori]

commit:     245f2bc647bd138151e2adce7c89bd816589d97c
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 14:45:42 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 14:49:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245f2bc6

app-i18n/pyzy: fix build with USE=boost

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/pyzy/files/pyzy-boost.patch | 15 +++++++++++++++
 app-i18n/pyzy/pyzy-0.1.0-r2.ebuild   |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/app-i18n/pyzy/files/pyzy-boost.patch b/app-i18n/pyzy/files/pyzy-boost.patch
new file mode 100644
index 00000000000..34acacfbc9b
--- /dev/null
+++ b/app-i18n/pyzy/files/pyzy-boost.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,9 +143,9 @@
+ )
+ if test x"$enable_boost" = x"yes"; then
+     # check boost
+-    BOOST_REQUIRE([1.39])
+-    BOOST_FIND_HEADER([boost/bind.hpp])
+-    BOOST_FIND_HEADER([boost/signals2.hpp])
++    AX_BOOST_BASE([1.39])
++    AC_CHECK_HEADERS([boost/bind.hpp])
++    AC_CHECK_HEADERS([boost/signals2.hpp])
+ fi
+ AM_CONDITIONAL(HAVE_BOOST, test x"$enable_boost" = x"yes")
+ 

diff --git a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
index 6ad508a8b2f..980f4f596c0 100644
--- a/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
+++ b/app-i18n/pyzy/pyzy-0.1.0-r2.ebuild
@@ -25,9 +25,11 @@ RDEPEND="dev-db/sqlite:3
 	opencc? ( app-i18n/opencc:= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-boost.patch
 	"${FILESDIR}"/${PN}-db.patch
 	"${FILESDIR}"/${PN}-opencc-1.0.0.patch
 )