Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/fordfrog:master commit in: media-gfx/valentina/files/, media-gfx/valentina/
Date: Thu, 18 Feb 2016 17:57:04
Message-Id: 1455818203.9c0786552e64f88b9dd2e1323c2dbcececcf666b.fordfrog@gentoo
1 commit: 9c0786552e64f88b9dd2e1323c2dbcececcf666b
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 18 17:56:43 2016 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 18 17:56:43 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=9c078655
7
8 improved live ebuild and added ebuild for release 0.4.2
9
10 Package-Manager: portage-2.2.27
11
12 media-gfx/valentina/Manifest | 5 ++-
13 media-gfx/valentina/files/locales.patch | 48 ++++++++++++++++++++++
14 ...alentina-9999.ebuild => valentina-0.4.2.ebuild} | 44 ++++++++++----------
15 media-gfx/valentina/valentina-9999.ebuild | 33 +++++++--------
16 4 files changed, 90 insertions(+), 40 deletions(-)
17
18 diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
19 index 431398c..ba28ec0 100644
20 --- a/media-gfx/valentina/Manifest
21 +++ b/media-gfx/valentina/Manifest
22 @@ -1,2 +1,5 @@
23 -EBUILD valentina-9999.ebuild 996 SHA256 b1bf672cfaaba9ea916c55d136aca69b7647fb601d735e4f628ccd8f6ce19629 SHA512 75d3da7a7ad6894efcf40e18526ef83e63a9b71681b90b3310f3037cda1403237041ba7c30d9e71ebfc5af35640a77dc7b09a3d3ee92619eaa5929a025ec86d8 WHIRLPOOL 199baa8774e332d7c2c8cb05b92542df0e365c8a758cda26ccc346fd29e0dedbf64f6cb33aa484c1d1fb744d7da8a3acd936658cc0c5949138e65f6ba40d48b1
24 +AUX locales.patch 962 SHA256 e9c938a3e1958f4a1697dc1a434c38352a1be4728553ecd23697484c164275f4 SHA512 5d5d10d9cfd13738126ef3bff9083ebd6c63f5c9c6902ded0d664214451739eae0da43e5f7059cebf672342e400d5cf71d2b9fd104ac4d2e118bd1a2f20d6bd7 WHIRLPOOL 49f75bcaec9ad57cccc88356831b2d8e73cde503b0d64f9feddf2c9e5640d36313db823b5bc9a69285811c4aea00384510951123dd3adc8e078647d40ece4c8e
25 +DIST valentina-0.4.2.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
26 +EBUILD valentina-0.4.2.ebuild 1170 SHA256 16e1fcdad004869b623479fd789065351e309d091cb2963aee9abd36cf728773 SHA512 8b71c83f449cfe62981db5fed35e5e8e7bd6ae81bf16687e1f90ebbf10ae2c83567ca4ef00c954dbaeadab8240cb27a605126347daa7f904bcf2acad1b8787a4 WHIRLPOOL b0895a0ae3c464c28af29aacb2de6ce38f0927037af44242f0a535945a3e30f91e545233e815587f2a5b4b8a1729faa76af7a4b5b21668fa8ee9f2078600a232
27 +EBUILD valentina-9999.ebuild 1082 SHA256 9432f4a99e7ba9b6a3b72c4cae3ffc504802267e775c6ce9141fe68fe0f02779 SHA512 3d945d7085135020eb250a8847238df13600d2f73771f05fff10cd497adeecad096fd6e0f041230c71dceb0e2de50a28210fa79680b658f7aa36160c7e72e700 WHIRLPOOL d202a6a621d26b86963cfdbf5c2bd654f7c85d82294e412013eaf5b08e71d435109553ba86de3773ffa16be324ba00eeebf8d2d9ba3c8f3dd6c167508dc6172d
28 MISC metadata.xml 231 SHA256 4bc2f7db3808a8af5bfcb1b6872d614d10ab90e18b9080222a6eb002caa106db SHA512 c82c98f938000c8ca127b85fbb1fb1f81f23fa06b9dea89768d1881ec03d138c774c7398c4d728078e4803855d866c3339d2a93c92cf29c14d85296a9b63772c WHIRLPOOL fa3c7b38645d861efb578c1310c2a9637c78c8d1c048b32b921c363ec0e73296b4a320f52e3ad587f04bfe81b6bc70625b682669a2424350f6fcb74d65961db4
29
30 diff --git a/media-gfx/valentina/files/locales.patch b/media-gfx/valentina/files/locales.patch
31 new file mode 100644
32 index 0000000..a908462
33 --- /dev/null
34 +++ b/media-gfx/valentina/files/locales.patch
35 @@ -0,0 +1,48 @@
36 +diff --git a/src/app/translations.pri b/src/app/translations.pri
37 +index b2dd2c4..87c55f7 100755
38 +--- a/src/app/translations.pri
39 ++++ b/src/app/translations.pri
40 +@@ -9,22 +9,27 @@ PMSYSTEMS += \
41 + p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
42 + p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
43 +
44 +-LANGUAGES += \
45 +- ru_RU \
46 +- uk_UA \
47 +- de_DE \
48 +- cs_CZ \
49 +- he_IL \
50 +- fr_FR \
51 +- it_IT \
52 +- nl_NL \
53 +- id_ID \
54 +- es_ES \
55 +- fi_FI \
56 +- en_US \
57 +- en_CA \
58 +- en_IN \
59 +- ro_RO
60 ++isEmpty(LOCALES){
61 ++ LANGUAGES += \
62 ++ ru_RU \
63 ++ uk_UA \
64 ++ de_DE \
65 ++ cs_CZ \
66 ++ he_IL \
67 ++ fr_FR \
68 ++ it_IT \
69 ++ nl_NL \
70 ++ id_ID \
71 ++ es_ES \
72 ++ fi_FI \
73 ++ en_US \
74 ++ en_CA \
75 ++ en_IN \
76 ++ ro_RO \
77 ++ zh_CN
78 ++ } else {
79 ++ LANGUAGES = $${LOCALES}
80 ++ }
81 +
82 + for(lang, LANGUAGES) {
83 + INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm
84
85 diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-0.4.2.ebuild
86 similarity index 52%
87 copy from media-gfx/valentina/valentina-9999.ebuild
88 copy to media-gfx/valentina/valentina-0.4.2.ebuild
89 index 8c5dd73..d3ce608 100644
90 --- a/media-gfx/valentina/valentina-9999.ebuild
91 +++ b/media-gfx/valentina/valentina-0.4.2.ebuild
92 @@ -4,34 +4,22 @@
93
94 EAPI=5
95
96 -inherit mercurial qmake-utils
97 +inherit qmake-utils
98
99 DESCRIPTION="Cloth patternmaking software"
100 HOMEPAGE="http://valentinaproject.bitbucket.org/"
101 -SRC_URI=""
102 -EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
103 -EHG_REVISION="develop"
104 +SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
105
106 LICENSE="GPL-3"
107 SLOT="0"
108 KEYWORDS="~amd64 ~x86"
109
110 # en_IN not supported in Gentoo so not added here
111 -IUSE="linguas_cs_CZ
112 - linguas_de_DE
113 - linguas_en_CA
114 - linguas_en_US
115 - linguas_es_ES
116 - linguas_fi_FI
117 - linguas_fr_FR
118 - linguas_he_IL
119 - linguas_id_ID
120 - linguas_it_IT
121 - linguas_nl_NL
122 - linguas_ro_RO
123 - linguas_ru_RU
124 - linguas_uk_UA
125 - linguas_zh_CN"
126 +LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
127 +
128 +for LANG in ${LANGS}; do
129 + IUSE="${IUSE} linguas_${LANG}"
130 +done
131
132 CDEPEND="
133 app-text/poppler
134 @@ -45,10 +33,24 @@ CDEPEND="
135 dev-qt/qtxmlpatterns:5"
136 RDEPEND="${CDEPEND}"
137 DEPEND="${CDEPEND}
138 - dev-util/ccache"
139 + app-arch/unzip"
140 +
141 +S=${WORKDIR}/dismine-${PN}-44d43351cb59
142 +
143 +src_prepare() {
144 + epatch ${FILESDIR}/locales.patch
145 +}
146
147 src_configure() {
148 - eqmake5 -r
149 + local locales=""
150 +
151 + for LANG in ${LANGS}; do
152 + if use linguas_${LANG}; then
153 + locales="${locales} ${LANG}"
154 + fi
155 + done
156 +
157 + eqmake5 LOCALES="${locales}" CONFIG+=no_ccache Valentina.pro -r
158 }
159
160 src_install() {
161
162 diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
163 index 8c5dd73..bb08d8f 100644
164 --- a/media-gfx/valentina/valentina-9999.ebuild
165 +++ b/media-gfx/valentina/valentina-9999.ebuild
166 @@ -17,21 +17,11 @@ SLOT="0"
167 KEYWORDS="~amd64 ~x86"
168
169 # en_IN not supported in Gentoo so not added here
170 -IUSE="linguas_cs_CZ
171 - linguas_de_DE
172 - linguas_en_CA
173 - linguas_en_US
174 - linguas_es_ES
175 - linguas_fi_FI
176 - linguas_fr_FR
177 - linguas_he_IL
178 - linguas_id_ID
179 - linguas_it_IT
180 - linguas_nl_NL
181 - linguas_ro_RO
182 - linguas_ru_RU
183 - linguas_uk_UA
184 - linguas_zh_CN"
185 +LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
186 +
187 +for LANG in ${LANGS}; do
188 + IUSE="${IUSE} linguas_${LANG}"
189 +done
190
191 CDEPEND="
192 app-text/poppler
193 @@ -44,11 +34,18 @@ CDEPEND="
194 dev-qt/qtxml:5
195 dev-qt/qtxmlpatterns:5"
196 RDEPEND="${CDEPEND}"
197 -DEPEND="${CDEPEND}
198 - dev-util/ccache"
199 +DEPEND="${CDEPEND}"
200
201 src_configure() {
202 - eqmake5 -r
203 + local locales=""
204 +
205 + for LANG in ${LANGS}; do
206 + if use linguas_${LANG}; then
207 + locales="${locales} ${LANG}"
208 + fi
209 + done
210 +
211 + eqmake5 LOCALES="${locales}" CONFIG+=no_ccache Valentina.pro -r
212 }
213
214 src_install() {