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 3C36C139085 for ; Sat, 17 Dec 2016 04:26:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B2D221C012; Sat, 17 Dec 2016 04:25:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15F0721C012 for ; Sat, 17 Dec 2016 04:25:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89B0534121E for ; Sat, 17 Dec 2016 04:25:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E07F71B for ; Sat, 17 Dec 2016 04:25:55 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1481948722.0aed34f7046029f7b312136e97e8d3f9451a6c80.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-docs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild X-VCS-Directories: dev-qt/qt-docs/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 0aed34f7046029f7b312136e97e8d3f9451a6c80 X-VCS-Branch: master Date: Sat, 17 Dec 2016 04:25:55 +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: 0947fd1f-4c44-4d8c-9952-c4ce300d3f0d X-Archives-Hash: 65919388247b95d64062afdf815dd7b2 commit: 0aed34f7046029f7b312136e97e8d3f9451a6c80 Author: Davide Pesavento gentoo org> AuthorDate: Sat Dec 17 04:25:22 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 17 04:25:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aed34f7 dev-qt/qt-docs: remove Makefile accidentally left in the archive by upstream Gentoo-Bug: 602750 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild index 542a8fb..c04b93d 100644 --- a/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild +++ b/dev-qt/qt-docs/qt-docs-5.7.1_p0.ebuild @@ -21,14 +21,20 @@ DEPEND="app-arch/p7zip" S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2) +src_prepare() { + default + + # bug 597026 + rm -r global || die + + # bug 602750 + rm Makefile || die +} + src_install() { # ${PV} instead of ${PF} is intentional local dest=/usr/share/doc/qt-${PV%%_p*} insinto "${dest}" doins -r * docompress -x "${dest}" - - # these files are not shipped in any other version of qt-docs and collide with qtcore - # bug 597026 - rm -rf "${ED}${dest}"/global || die }