1 |
pinkbyte 14/06/23 10:02:57 |
2 |
|
3 |
Modified: ChangeLog q4wine-1.1_p2-r1.ebuild |
4 |
Log: |
5 |
Fix locale handling by using full locale names, wrt bug #496508. Minor QA fixes. Thanks to Kjell Claesson <kjell.claesson AT epost.tidanet.se> for discovering this issue |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42) |
8 |
|
9 |
Revision Changes Path |
10 |
1.51 app-emulation/q4wine/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/ChangeLog?rev=1.51&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/ChangeLog?rev=1.51&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/ChangeLog?r1=1.50&r2=1.51 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v |
19 |
retrieving revision 1.50 |
20 |
retrieving revision 1.51 |
21 |
diff -u -r1.50 -r1.51 |
22 |
--- ChangeLog 2 Jan 2014 20:13:14 -0000 1.50 |
23 |
+++ ChangeLog 23 Jun 2014 10:02:57 -0000 1.51 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for app-emulation/q4wine |
26 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.50 2014/01/02 20:13:14 hwoarang Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/ChangeLog,v 1.51 2014/06/23 10:02:57 pinkbyte Exp $ |
29 |
+ |
30 |
+ 23 Jun 2014; Sergey Popov <pinkbyte@g.o> q4wine-1.1_p2-r1.ebuild: |
31 |
+ Fix locale handling by using full locale names, wrt bug #496508. Minor QA |
32 |
+ fixes. Thanks to Kjell Claesson <kjell.claesson AT epost.tidanet.se> for |
33 |
+ discovering this issue |
34 |
|
35 |
02 Jan 2014; Markos Chandras <hwoarang@g.o> q4wine-1.1_p2-r1.ebuild: |
36 |
Depend on qtsingleapplication[X] to fix configure failure |
37 |
|
38 |
|
39 |
|
40 |
1.3 app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild?rev=1.3&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild?rev=1.3&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild?r1=1.2&r2=1.3 |
45 |
|
46 |
Index: q4wine-1.1_p2-r1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v |
49 |
retrieving revision 1.2 |
50 |
retrieving revision 1.3 |
51 |
diff -u -r1.2 -r1.3 |
52 |
--- q4wine-1.1_p2-r1.ebuild 2 Jan 2014 20:13:14 -0000 1.2 |
53 |
+++ q4wine-1.1_p2-r1.ebuild 23 Jun 2014 10:02:57 -0000 1.3 |
54 |
@@ -1,10 +1,10 @@ |
55 |
# Copyright 1999-2014 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.2 2014/01/02 20:13:14 hwoarang Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.1_p2-r1.ebuild,v 1.3 2014/06/23 10:02:57 pinkbyte Exp $ |
59 |
|
60 |
EAPI=5 |
61 |
|
62 |
-PLOCALES="af cs de en es fa he it ru uk pl pt" |
63 |
+PLOCALES="af_ZA cs_CZ de_DE en_US es_ES fa_IR he_IL it_IT pl_PL pt_BR ru_RU uk_UA" |
64 |
PLOCALE_BACKUP="en_US" |
65 |
|
66 |
inherit cmake-utils l10n |
67 |
@@ -14,8 +14,8 @@ |
68 |
|
69 |
# Upstream names the package PV-rX. We change that to |
70 |
# PV_pX so we can use portage revisions. |
71 |
-MY_PV=${PV/_p/-r} |
72 |
-MY_P=${PN}-${MY_PV} |
73 |
+MY_PV="${PV/_p/-r}" |
74 |
+MY_P="${PN}-${MY_PV}" |
75 |
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${MY_PV}/${MY_P}.tar.bz2" |
76 |
|
77 |
LICENSE="GPL-3" |
78 |
@@ -26,7 +26,7 @@ |
79 |
DEPEND=" |
80 |
dev-qt/qtcore:4 |
81 |
dev-qt/qtgui:4 |
82 |
- dev-qt/qtsingleapplication[X(+)] |
83 |
+ dev-qt/qtsingleapplication[X] |
84 |
dev-qt/qtsql:4[sqlite] |
85 |
dbus? ( dev-qt/qtdbus:4 ) |
86 |
" |
87 |
@@ -38,22 +38,19 @@ |
88 |
icoutils? ( >=media-gfx/icoutils-0.26.0 ) |
89 |
" |
90 |
|
91 |
-S=${WORKDIR}/${MY_P} |
92 |
+S="${WORKDIR}/${MY_P}" |
93 |
|
94 |
-DOCS=(README AUTHORS ChangeLog) |
95 |
- |
96 |
-remove_from_LINGUAS() { |
97 |
- sed -i -e "/SET\s*(\s*LINGUAS / s: ${1}_\w\w::" \ |
98 |
- src/CMakeLists.txt || die |
99 |
-} |
100 |
- |
101 |
-src_prepare() { |
102 |
- cmake-utils_src_prepare |
103 |
- l10n_for_each_disabled_locale_do remove_from_LINGUAS |
104 |
-} |
105 |
+DOCS=( AUTHORS ChangeLog README ) |
106 |
|
107 |
src_configure() { |
108 |
+ local enabled_linguas |
109 |
+ construct_LINGUAS() { |
110 |
+ local current_locale="$(echo ${1} | tr '[:upper:]' '[:lower:]')" |
111 |
+ enabled_linguas="${enabled_linguas};${current_locale}" |
112 |
+ } |
113 |
+ l10n_for_each_locale_do construct_LINGUAS |
114 |
local mycmakeargs=( |
115 |
+ -DLINGUAS="${enabled_linguas}" |
116 |
-DQT5=OFF |
117 |
-DWITH_SYSTEM_SINGLEAPP=ON |
118 |
$(cmake-utils_use debug) |