From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 22 Oct 2018 11:09:47 +0100
Subject: gentoo resync : 22.10.2018

---
 app-i18n/opencc/Manifest                     |  5 +++--
 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 +++++--
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 app-i18n/opencc/files/opencc-stop-copy.patch

(limited to 'app-i18n/opencc')

diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 1cac514ef514..28a34dfa509d 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,5 +1,6 @@
+AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
 AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-EBUILD opencc-1.0.5.ebuild 951 BLAKE2B 5754abcfea97a56100601ae189e2274542976063ab0ee943f227c67e98381dde4bfe1e153f6d9474eb79be2edbc8c73b220826589489f5c612751feb9314b240 SHA512 065cf96608de11939d91a30c5d1c6358c64066cd3a3c858d2c4ecc4aef2a4b77a83554e072e0f05234331818b7a4662dd32dfe114735023dd6ff0f44686aba8c
-EBUILD opencc-9999.ebuild 927 BLAKE2B 00d77822d6157ce7f0c29c6db267b76571a49c7ee80c8cbce464df499b23b42e99fb2e92795895cef2cb7485be3a9ec96c8db3d2148a7f19cefcb3e338913364 SHA512 868b831de1cc47afe1b471848df50eb036c8f29701839a3ca3767aba8e42b10a227dd9dc33ee726331a890ef3938ef71af444582f1f2d16c785158f7b36e5eb6
+EBUILD opencc-1.0.5.ebuild 986 BLAKE2B 7c74849f384202578f91e0b597415e6aa93f37e44537d6a4792d366ce997eb9d4c72d1a689fea400e2c900b73ea6ab83616379d3507f078b7a556bc706212d7d SHA512 a0fb31fe4ff4d791bdd837080e08844728c1da240f92dfa6a465e56cd3d733e5c592a62b92a9343837d6a47c062e2211f28e9ff3fb2bd47bce663ce19630880e
+EBUILD opencc-9999.ebuild 962 BLAKE2B 030f0cffd01ec8ebd917e2803d4222a7b365707fb2b5a18ccf4c61e6615522cc61c67f4a65eb2b01bcbfba56a4bf86e633d41fb1cbca620b9285c9c32c54d1db SHA512 1509dc3acde4d1d54ec538e6fad7b4310e0f0ce1616114f6200b6edfa7239e035483b03fe9ca033b3113cbf2d037ba272154181a754a34efe7a164e9b22363fe
 MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
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 000000000000..4793951dd251
--- /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 ba948e2bf80d..2ddcaab943f2 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 9ec1cbd5d8b7..857d6dd70b8e 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
-- 
cgit v1.2.3