From: Matthias Maier <tamiko@gentoo.org>
Date: Fri, 27 Nov 2015 20:40:54 +0000 (-0600)
Subject: app-emulation/virt-manager: Fix file collision, reintroduce linguas_* flags
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=40ad7dd62389a76603937e0e53a11250502cc694;p=gentoo.git

app-emulation/virt-manager: Fix file collision, reintroduce linguas_* flags

 - Fix a file collision with caches being accidentally generated too early
   and registered as belonging to the ebuild (bug #566874).

 - Reintroduce fine grained linguas_* use flags to control installed
   language files.

Thanks to iGentoo for the patches and the bug report

Gentoo-Bug: 566874

Package-Manager: portage-2.2.24
---

diff --git a/app-emulation/virt-manager/virt-manager-1.3.0.ebuild b/app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild
similarity index 80%
rename from app-emulation/virt-manager/virt-manager-1.3.0.ebuild
rename to app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild
index e1ba253e4a1b..9a6fb846d3e3 100644
--- a/app-emulation/virt-manager/virt-manager-1.3.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild
@@ -22,9 +22,13 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is
+	it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te
+	tr uk vi zh_CN zh_TW )
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
+IUSE="gnome-keyring gtk policykit sasl ${VM_LINGUAS[@]/#/linguas_}"
 
 RDEPEND="!app-emulation/virtinst
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
@@ -54,6 +58,11 @@ DOCS=( README NEWS )
 
 src_prepare() {
 	distutils-r1_src_prepare
+
+	local lang
+	for lang in ${VM_LINGUAS[@]}; do
+		use linguas_${lang} || rm -v "po/${lang}.po" || die
+	done
 }
 
 distutils-r1_python_compile() {
@@ -64,10 +73,13 @@ distutils-r1_python_compile() {
 		--default-graphics=spice
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+
+	distutils-r1_src_install
+
 	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
+		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
 }
 
 pkg_preinst() {
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index e1ba253e4a1b..9a6fb846d3e3 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -22,9 +22,13 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is
+	it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te
+	tr uk vi zh_CN zh_TW )
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
+IUSE="gnome-keyring gtk policykit sasl ${VM_LINGUAS[@]/#/linguas_}"
 
 RDEPEND="!app-emulation/virtinst
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
@@ -54,6 +58,11 @@ DOCS=( README NEWS )
 
 src_prepare() {
 	distutils-r1_src_prepare
+
+	local lang
+	for lang in ${VM_LINGUAS[@]}; do
+		use linguas_${lang} || rm -v "po/${lang}.po" || die
+	done
 }
 
 distutils-r1_python_compile() {
@@ -64,10 +73,13 @@ distutils-r1_python_compile() {
 		--default-graphics=spice
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+src_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+
+	distutils-r1_src_install
+
 	python_fix_shebang \
-		"${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
+		"${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager}
 }
 
 pkg_preinst() {