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 A6420138334 for ; Fri, 9 Nov 2018 14:08:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3093E0C9C; Fri, 9 Nov 2018 14:08:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9828FE0C9C for ; Fri, 9 Nov 2018 14:08:26 +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 91282335CEB for ; Fri, 9 Nov 2018 14:08:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55572443 for ; Fri, 9 Nov 2018 14:08:21 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1541772462.37baed5e82bada2d220e641ebf3f06c65a5bd44b.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/coolreader/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/coolreader/coolreader-3.2.2.1-r2.ebuild X-VCS-Directories: app-text/coolreader/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 37baed5e82bada2d220e641ebf3f06c65a5bd44b X-VCS-Branch: master Date: Fri, 9 Nov 2018 14:08:21 +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: 730ec0b7-49c6-41d3-bdd6-eef0b9dd4c77 X-Archives-Hash: 6b5f44cc419b427e0bd026d797dfeee5 commit: 37baed5e82bada2d220e641ebf3f06c65a5bd44b Author: Andrey Grozin gentoo org> AuthorDate: Fri Nov 9 14:07:42 2018 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Fri Nov 9 14:07:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37baed5e app-text/coolreader: fix building with USE=wxwidgets Fixes: https://bugs.gentoo.org/670206 Signed-off-by: Andrey Grozin gentoo.org> Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-text/coolreader/coolreader-3.2.2.1-r2.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild index 71c68d68f32..db5d2760de9 100644 --- a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild +++ b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild @@ -76,10 +76,12 @@ src_configure() { src_install() { cmake-utils_src_install - mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed" - rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed" - gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed" - gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed" + if ! use wxwidgets; then + mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed" + rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed" + gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed" + gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed" + fi } pkg_postinst() {