1 |
commit: 40ad7dd62389a76603937e0e53a11250502cc694 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 27 20:40:54 2015 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 27 20:41:29 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ad7dd6 |
7 |
|
8 |
app-emulation/virt-manager: Fix file collision, reintroduce linguas_* flags |
9 |
|
10 |
- Fix a file collision with caches being accidentally generated too early |
11 |
and registered as belonging to the ebuild (bug #566874). |
12 |
|
13 |
- Reintroduce fine grained linguas_* use flags to control installed |
14 |
language files. |
15 |
|
16 |
Thanks to iGentoo for the patches and the bug report |
17 |
|
18 |
Gentoo-Bug: 566874 |
19 |
|
20 |
Package-Manager: portage-2.2.24 |
21 |
|
22 |
...ger-1.3.0.ebuild => virt-manager-1.3.0-r1.ebuild} | 20 ++++++++++++++++---- |
23 |
app-emulation/virt-manager/virt-manager-9999.ebuild | 20 ++++++++++++++++---- |
24 |
2 files changed, 32 insertions(+), 8 deletions(-) |
25 |
|
26 |
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 |
27 |
similarity index 80% |
28 |
rename from app-emulation/virt-manager/virt-manager-1.3.0.ebuild |
29 |
rename to app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild |
30 |
index e1ba253..9a6fb84 100644 |
31 |
--- a/app-emulation/virt-manager/virt-manager-1.3.0.ebuild |
32 |
+++ b/app-emulation/virt-manager/virt-manager-1.3.0-r1.ebuild |
33 |
@@ -22,9 +22,13 @@ else |
34 |
KEYWORDS="~amd64 ~x86" |
35 |
fi |
36 |
|
37 |
+VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is |
38 |
+ it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te |
39 |
+ tr uk vi zh_CN zh_TW ) |
40 |
+ |
41 |
LICENSE="GPL-2" |
42 |
SLOT="0" |
43 |
-IUSE="gnome-keyring gtk policykit sasl" |
44 |
+IUSE="gnome-keyring gtk policykit sasl ${VM_LINGUAS[@]/#/linguas_}" |
45 |
|
46 |
RDEPEND="!app-emulation/virtinst |
47 |
dev-python/libvirt-python[${PYTHON_USEDEP}] |
48 |
@@ -54,6 +58,11 @@ DOCS=( README NEWS ) |
49 |
|
50 |
src_prepare() { |
51 |
distutils-r1_src_prepare |
52 |
+ |
53 |
+ local lang |
54 |
+ for lang in ${VM_LINGUAS[@]}; do |
55 |
+ use linguas_${lang} || rm -v "po/${lang}.po" || die |
56 |
+ done |
57 |
} |
58 |
|
59 |
distutils-r1_python_compile() { |
60 |
@@ -64,10 +73,13 @@ distutils-r1_python_compile() { |
61 |
--default-graphics=spice |
62 |
} |
63 |
|
64 |
-python_install_all() { |
65 |
- distutils-r1_python_install_all |
66 |
+src_install() { |
67 |
+ local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) |
68 |
+ |
69 |
+ distutils-r1_src_install |
70 |
+ |
71 |
python_fix_shebang \ |
72 |
- "${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager} |
73 |
+ "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager} |
74 |
} |
75 |
|
76 |
pkg_preinst() { |
77 |
|
78 |
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild |
79 |
index e1ba253..9a6fb84 100644 |
80 |
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild |
81 |
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild |
82 |
@@ -22,9 +22,13 @@ else |
83 |
KEYWORDS="~amd64 ~x86" |
84 |
fi |
85 |
|
86 |
+VM_LINGUAS=( as bg bn_IN bs ca cmn cs da de en_GB es fi fr gu hi hr hu is |
87 |
+ it ja kn ko ml mr ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te |
88 |
+ tr uk vi zh_CN zh_TW ) |
89 |
+ |
90 |
LICENSE="GPL-2" |
91 |
SLOT="0" |
92 |
-IUSE="gnome-keyring gtk policykit sasl" |
93 |
+IUSE="gnome-keyring gtk policykit sasl ${VM_LINGUAS[@]/#/linguas_}" |
94 |
|
95 |
RDEPEND="!app-emulation/virtinst |
96 |
dev-python/libvirt-python[${PYTHON_USEDEP}] |
97 |
@@ -54,6 +58,11 @@ DOCS=( README NEWS ) |
98 |
|
99 |
src_prepare() { |
100 |
distutils-r1_src_prepare |
101 |
+ |
102 |
+ local lang |
103 |
+ for lang in ${VM_LINGUAS[@]}; do |
104 |
+ use linguas_${lang} || rm -v "po/${lang}.po" || die |
105 |
+ done |
106 |
} |
107 |
|
108 |
distutils-r1_python_compile() { |
109 |
@@ -64,10 +73,13 @@ distutils-r1_python_compile() { |
110 |
--default-graphics=spice |
111 |
} |
112 |
|
113 |
-python_install_all() { |
114 |
- distutils-r1_python_install_all |
115 |
+src_install() { |
116 |
+ local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) |
117 |
+ |
118 |
+ distutils-r1_src_install |
119 |
+ |
120 |
python_fix_shebang \ |
121 |
- "${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager} |
122 |
+ "${ED}"/usr/share/virt-manager/virt-{clone,convert,install,manager} |
123 |
} |
124 |
|
125 |
pkg_preinst() { |