commit:     528a0e46c9372308ce4390d000389bc9ea863965
Author:     Hendrik v. Raven <hendrik <AT> consetetur <DOT> de>
AuthorDate: Thu Sep 20 06:39:33 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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

Reply via email to