[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ - gentoo-commits

From:	"Ulrich Müller" <ulm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/
Date:	Fri, 05 Jan 2018 15:38:45
Message-Id:	`1515166711.219b6892d36fc266ac6e8c2c960fb33d86ed7743.ulm@gentoo`

1

commit:     219b6892d36fc266ac6e8c2c960fb33d86ed7743

2

Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

3

AuthorDate: Fri Jan  5 14:24:13 2018 +0000

4

Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

5

CommitDate: Fri Jan  5 15:38:31 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219b6892

7

8

dev-qt/qt-creator: Migrate from LINGUAS to L10N.

9

10

Package-Manager: Portage-2.3.19, Repoman-2.3.6

11

12

 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 15 ++++++++++-----

13

 dev-qt/qt-creator/qt-creator-4.4.1.ebuild | 15 ++++++++++-----

14

 dev-qt/qt-creator/qt-creator-9999.ebuild  | 15 ++++++++++-----

15

 3 files changed, 30 insertions(+), 15 deletions(-)

16

17

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild

18

index 5be7d95dd51..8e8a0f9cca3 100644

19

--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild

20

+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild

21

@@ -1,11 +1,11 @@

22

-# Copyright 1999-2017 Gentoo Foundation

23

+# Copyright 1999-2018 Gentoo Foundation

24

 # Distributed under the terms of the GNU General Public License v2

25

26

 EAPI=6

27

 LLVM_MAX_SLOT=4

28

-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"

29

+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"

30

31

-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg

32

+inherit llvm qmake-utils toolchain-funcs virtualx xdg

33

34

 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

35

 HOMEPAGE="https://doc.qt.io/qtcreator/"

36

@@ -88,7 +88,8 @@ RDEPEND="${CDEPEND}

37

"

38

 # qt translations must also be installed or qt-creator translations won't be loaded

39

 for x in ${PLOCALES}; do

40

-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

41

+	IUSE+=" l10n_${x}"

42

+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

43

 done

44

 unset x

45

46

@@ -151,7 +152,11 @@ src_prepare() {

47

 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die

48

49

 	# fix translations

50

-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die

51

+	local lang languages=

52

+	for lang in ${PLOCALES}; do

53

+		use l10n_${lang} && languages+=" ${lang/-/_}"

54

+	done

55

+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die

56

57

 	# remove bundled qbs

58

 	rm -rf src/shared/qbs || die

59

60

diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild

61

index 322f20850b8..38641edea7d 100644

62

--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild

63

+++ b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild

64

@@ -1,10 +1,10 @@

65

-# Copyright 1999-2017 Gentoo Foundation

66

+# Copyright 1999-2018 Gentoo Foundation

67

 # Distributed under the terms of the GNU General Public License v2

68

69

 EAPI=6

70

-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"

71

+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"

72

73

-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg

74

+inherit llvm qmake-utils toolchain-funcs virtualx xdg

75

76

 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

77

 HOMEPAGE="https://doc.qt.io/qtcreator/"

78

@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}

79

"

80

 # qt translations must also be installed or qt-creator translations won't be loaded

81

 for x in ${PLOCALES}; do

82

-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

83

+	IUSE+=" l10n_${x}"

84

+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

85

 done

86

 unset x

87

88

@@ -145,7 +146,11 @@ src_prepare() {

89

 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die

90

91

 	# fix translations

92

-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die

93

+	local lang languages=

94

+	for lang in ${PLOCALES}; do

95

+		use l10n_${lang} && languages+=" ${lang/-/_}"

96

+	done

97

+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die

98

99

 	# remove bundled qbs

100

 	rm -rf src/shared/qbs || die

101

102

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild

103

index 322f20850b8..38641edea7d 100644

104

--- a/dev-qt/qt-creator/qt-creator-9999.ebuild

105

+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild

106

@@ -1,10 +1,10 @@

107

-# Copyright 1999-2017 Gentoo Foundation

108

+# Copyright 1999-2018 Gentoo Foundation

109

 # Distributed under the terms of the GNU General Public License v2

110

111

 EAPI=6

112

-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"

113

+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"

114

115

-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg

116

+inherit llvm qmake-utils toolchain-funcs virtualx xdg

117

118

 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

119

 HOMEPAGE="https://doc.qt.io/qtcreator/"

120

@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}

121

"

122

 # qt translations must also be installed or qt-creator translations won't be loaded

123

 for x in ${PLOCALES}; do

124

-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

125

+	IUSE+=" l10n_${x}"

126

+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"

127

 done

128

 unset x

129

130

@@ -145,7 +146,11 @@ src_prepare() {

131

 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die

132

133

 	# fix translations

134

-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die

135

+	local lang languages=

136

+	for lang in ${PLOCALES}; do

137

+		use l10n_${lang} && languages+=" ${lang/-/_}"

138

+	done

139

+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die

140

141

 	# remove bundled qbs

142

 	rm -rf src/shared/qbs || die

1	commit: 219b6892d36fc266ac6e8c2c960fb33d86ed7743
2	Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3	AuthorDate: Fri Jan 5 14:24:13 2018 +0000
4	Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5	CommitDate: Fri Jan 5 15:38:31 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219b6892
7
8	dev-qt/qt-creator: Migrate from LINGUAS to L10N.
9
10	Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12	dev-qt/qt-creator/qt-creator-4.3.1.ebuild \| 15 ++++++++++-----
13	dev-qt/qt-creator/qt-creator-4.4.1.ebuild \| 15 ++++++++++-----
14	dev-qt/qt-creator/qt-creator-9999.ebuild \| 15 ++++++++++-----
15	3 files changed, 30 insertions(+), 15 deletions(-)
16
17	diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
18	index 5be7d95dd51..8e8a0f9cca3 100644
19	--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
20	+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
21	@@ -1,11 +1,11 @@
22	-# Copyright 1999-2017 Gentoo Foundation
23	+# Copyright 1999-2018 Gentoo Foundation
24	# Distributed under the terms of the GNU General Public License v2
25
26	EAPI=6
27	LLVM_MAX_SLOT=4
28	-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
29	+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
30
31	-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
32	+inherit llvm qmake-utils toolchain-funcs virtualx xdg
33
34	DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
35	HOMEPAGE="https://doc.qt.io/qtcreator/"
36	@@ -88,7 +88,8 @@ RDEPEND="${CDEPEND}
37	"
38	# qt translations must also be installed or qt-creator translations won't be loaded
39	for x in ${PLOCALES}; do
40	- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
41	+ IUSE+=" l10n_${x}"
42	+ RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
43	done
44	unset x
45
46	@@ -151,7 +152,11 @@ src_prepare() {
47	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri \|\| die
48
49	# fix translations
50	- sed -i -e "/^LANGUAGES\s=/ s:=.:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro \|\| die
51	+ local lang languages=
52	+ for lang in ${PLOCALES}; do
53	+ use l10n_${lang} && languages+=" ${lang/-/_}"
54	+ done
55	+ sed -i -e "/^LANGUAGES\s=/ s:=.:=${languages}:" share/qtcreator/translations/translations.pro \|\| die
56
57	# remove bundled qbs
58	rm -rf src/shared/qbs \|\| die
59
60	diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
61	index 322f20850b8..38641edea7d 100644
62	--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
63	+++ b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
64	@@ -1,10 +1,10 @@
65	-# Copyright 1999-2017 Gentoo Foundation
66	+# Copyright 1999-2018 Gentoo Foundation
67	# Distributed under the terms of the GNU General Public License v2
68
69	EAPI=6
70	-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
71	+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
72
73	-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
74	+inherit llvm qmake-utils toolchain-funcs virtualx xdg
75
76	DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
77	HOMEPAGE="https://doc.qt.io/qtcreator/"
78	@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}
79	"
80	# qt translations must also be installed or qt-creator translations won't be loaded
81	for x in ${PLOCALES}; do
82	- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
83	+ IUSE+=" l10n_${x}"
84	+ RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
85	done
86	unset x
87
88	@@ -145,7 +146,11 @@ src_prepare() {
89	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri \|\| die
90
91	# fix translations
92	- sed -i -e "/^LANGUAGES\s=/ s:=.:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro \|\| die
93	+ local lang languages=
94	+ for lang in ${PLOCALES}; do
95	+ use l10n_${lang} && languages+=" ${lang/-/_}"
96	+ done
97	+ sed -i -e "/^LANGUAGES\s=/ s:=.:=${languages}:" share/qtcreator/translations/translations.pro \|\| die
98
99	# remove bundled qbs
100	rm -rf src/shared/qbs \|\| die
101
102	diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
103	index 322f20850b8..38641edea7d 100644
104	--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
105	+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
106	@@ -1,10 +1,10 @@
107	-# Copyright 1999-2017 Gentoo Foundation
108	+# Copyright 1999-2018 Gentoo Foundation
109	# Distributed under the terms of the GNU General Public License v2
110
111	EAPI=6
112	-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
113	+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
114
115	-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
116	+inherit llvm qmake-utils toolchain-funcs virtualx xdg
117
118	DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
119	HOMEPAGE="https://doc.qt.io/qtcreator/"
120	@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}
121	"
122	# qt translations must also be installed or qt-creator translations won't be loaded
123	for x in ${PLOCALES}; do
124	- RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
125	+ IUSE+=" l10n_${x}"
126	+ RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
127	done
128	unset x
129
130	@@ -145,7 +146,11 @@ src_prepare() {
131	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri \|\| die
132
133	# fix translations
134	- sed -i -e "/^LANGUAGES\s=/ s:=.:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro \|\| die
135	+ local lang languages=
136	+ for lang in ${PLOCALES}; do
137	+ use l10n_${lang} && languages+=" ${lang/-/_}"
138	+ done
139	+ sed -i -e "/^LANGUAGES\s=/ s:=.:=${languages}:" share/qtcreator/translations/translations.pro \|\| die
140
141	# remove bundled qbs
142	rm -rf src/shared/qbs \|\| die

Gentoo Archives: gentoo-commits