From: Hendrik v. Raven <hendrik@consetetur.de>
Date: Thu, 20 Sep 2018 06:39:33 +0000 (+0200)
Subject: app-admin/passwordsafe: correct install locations
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=528a0e46c9372308ce4390d000389bc9ea863965;p=gentoo.git

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
---

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 2a8d7c884957..1a344e260218 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