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 26A7D1382C5 for ; Wed, 14 Feb 2018 21:00:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27F56E0C14; Wed, 14 Feb 2018 21:00:14 +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 0537BE0C14 for ; Wed, 14 Feb 2018 21:00:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 69F5C335C49 for ; Wed, 14 Feb 2018 21:00:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30B241E0 for ; Wed, 14 Feb 2018 21:00:05 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1518641959.be23a9b584a5ac3bd1b6ea046b0f7d90e930a534.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/qt5-sqlcipher/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild X-VCS-Directories: dev-db/qt5-sqlcipher/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: be23a9b584a5ac3bd1b6ea046b0f7d90e930a534 X-VCS-Branch: master Date: Wed, 14 Feb 2018 21:00:05 +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: 0918443d-da47-433f-a24a-f938392b9592 X-Archives-Hash: 099fff59a51cfe9a76eb91b00014af61 commit: be23a9b584a5ac3bd1b6ea046b0f7d90e930a534 Author: Ulrich Müller gentoo org> AuthorDate: Wed Feb 14 20:59:19 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Feb 14 20:59:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be23a9b5 dev-db/qt5-sqlcipher: Fix build with Qt 5.9.4. Cached files for Qt versions 5.9.3 and 5.9.4 are identical, so simpy copy them. Bug: https://bugs.gentoo.org/647624 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild index 75caf3f0bb1..74d3f8006b7 100644 --- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild +++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,6 +24,8 @@ DOCS=(README.md) src_prepare() { eapply "${FILESDIR}"/${PN}-install-path.patch sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die + # workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical) + cp -R qt-file-cache/5.9.{3,4} || die cmake-utils_src_prepare }