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 765E2138334 for ; Fri, 21 Sep 2018 15:46:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52434E0824; Fri, 21 Sep 2018 15:46:10 +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 27969E0824 for ; Fri, 21 Sep 2018 15:46:08 +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 D742D335CEB for ; Fri, 21 Sep 2018 15:46:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3DD13D5 for ; Fri, 21 Sep 2018 15:46:04 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1537544758.528a0e46c9372308ce4390d000389bc9ea863965.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/passwordsafe/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/passwordsafe/passwordsafe-1.06_beta-r1.ebuild app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild X-VCS-Directories: app-admin/passwordsafe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 528a0e46c9372308ce4390d000389bc9ea863965 X-VCS-Branch: master Date: Fri, 21 Sep 2018 15:46:04 +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: d0442795-7d2f-4632-8e29-6370229e3ba8 X-Archives-Hash: 83622d71f5b736abbcfb68c4c419d64b commit: 528a0e46c9372308ce4390d000389bc9ea863965 Author: Hendrik v. Raven consetetur de> AuthorDate: Thu Sep 20 06:39:33 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Sep 21 15:45:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528a0e46 app-admin/passwordsafe: correct install locations xml and help files have been moved to /usr/share/passwordsafe. Package-Manager: Portage-2.3.49, Repoman-2.3.10 Closes: https://github.com/gentoo/gentoo/pull/9679 ...dsafe-1.06_beta.ebuild => passwordsafe-1.06_beta-r1.ebuild} | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.06_beta-r1.ebuild similarity index 86% rename from app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild rename to app-admin/passwordsafe/passwordsafe-1.06_beta-r1.ebuild index 2a8d7c88495..1a344e26021 100644 --- a/app-admin/passwordsafe/passwordsafe-1.06_beta.ebuild +++ b/app-admin/passwordsafe/passwordsafe-1.06_beta-r1.ebuild @@ -77,11 +77,7 @@ src_install() { insinto /usr/share/locale doins -r src/ui/wxWidgets/I18N/mos/* - # The upstream Makefile builds this .zip file from html source material for - # use by the package's internal help system. Must prevent - # Portage from applying additional compression. - docompress -x /usr/share/doc/${PN}/help - insinto /usr/share/doc/${PN}/help + insinto /usr/share/${PN}/help doins help/*.zip popd || die @@ -90,8 +86,8 @@ src_install() { dodoc README.md README.LINUX.* docs/{ReleaseNotes.txt,ChangeLog.txt} - insinto /usr/share/pwsafe/xml - doins xml/* + insinto /usr/share/${PN} + doins -r xml newicon install/graphics/pwsafe.png ${PN}.png newmenu install/desktop/pwsafe.desktop ${PN}.desktop