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

["Naohiro Aota" <naota@gentoo.org>]

commit:     50be00f6ee1ce7eaa585389586a5d838e65e647b
Author:     Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 17:56:23 2018 +0000
Commit:     Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 17:57:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50be00f6

app-i18n/opencc: add patch to avoid conflicting copy

copy command is only necessary in VS build, and it's causing conflict on
parallel build. Dropping the command is safe on Linux.

Closes: https://bugs.gentoo.org/666904
Signed-off-by: Naohiro Aota <naota <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 app-i18n/opencc/files/opencc-stop-copy.patch | 18 ++++++++++++++++++
 app-i18n/opencc/opencc-1.0.5.ebuild          |  7 +++++--
 app-i18n/opencc/opencc-9999.ebuild           |  7 +++++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch
new file mode 100644
index 00000000000..4793951dd25
--- /dev/null
+++ b/app-i18n/opencc/files/opencc-stop-copy.patch
@@ -0,0 +1,18 @@
+We don't need this copy command on Linux (or other than Visual Studio
+build).  Since it is colliding each other on parallel build, drop the
+command for now.
+
+See https://bugs.gentoo.org/666904
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 1516775..2deb764 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -109,8 +109,6 @@ foreach(DICT ${DICTS})
+       ${DICT}.ocd
+     COMMENT
+       "Building ${DICT}.ocd"
+-    COMMAND
+-      ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>"
+     COMMAND
+       ${OPENCC_DICT_BIN}
+         --input ${DICT_${DICT}_INPUT}

diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index ba948e2bf80..2ddcaab943f 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,10 @@ IUSE="doc test"
 DEPEND="doc? ( app-doc/doxygen )"
 
 DOCS="AUTHORS *.md"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-stop-copy.patch
+)
 
 src_prepare() {
 	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt

diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild
index 9ec1cbd5d8b..857d6dd70b8 100644
--- a/app-i18n/opencc/opencc-9999.ebuild
+++ b/app-i18n/opencc/opencc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,10 @@ IUSE="doc test"
 DEPEND="doc? ( app-doc/doxygen )"
 
 DOCS="AUTHORS *.md"
-PATCHES=( "${FILESDIR}"/${PN}-test.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-test.patch
+	"${FILESDIR}"/${PN}-stop-copy.patch
+)
 
 src_prepare() {
 	sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt