From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99D1B138334 for ; Tue, 9 Oct 2018 17:58:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B9C9E07EF; Tue, 9 Oct 2018 17:58:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22FCCE07E2 for ; Tue, 9 Oct 2018 17:58:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1027E335CF9 for ; Tue, 9 Oct 2018 17:58:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E2993E2 for ; Tue, 9 Oct 2018 17:58:09 +0000 (UTC) From: "Naohiro Aota" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Naohiro Aota" Message-ID: <1539107851.50be00f6ee1ce7eaa585389586a5d838e65e647b.naota@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/opencc/, app-i18n/opencc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/opencc/files/opencc-stop-copy.patch app-i18n/opencc/opencc-1.0.5.ebuild app-i18n/opencc/opencc-9999.ebuild X-VCS-Directories: app-i18n/opencc/files/ app-i18n/opencc/ X-VCS-Committer: naota X-VCS-Committer-Name: Naohiro Aota X-VCS-Revision: 50be00f6ee1ce7eaa585389586a5d838e65e647b X-VCS-Branch: master Date: Tue, 9 Oct 2018 17:58:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e15e4cf0-0941-445f-a794-95539aa9d925 X-Archives-Hash: 98362ab1743330bb73da3da5ad89d218 commit: 50be00f6ee1ce7eaa585389586a5d838e65e647b Author: Naohiro Aota gentoo org> AuthorDate: Tue Oct 9 17:56:23 2018 +0000 Commit: Naohiro Aota gentoo 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 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 "$" "$" + 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