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

From:	Davide Pesavento <pesa@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/
Date:	Sat, 26 Oct 2019 20:13:59
Message-Id:	`1572120824.cdcd3965d96eee989ec92090d52ae6d1efa285fd.pesa@gentoo`

1

commit:     cdcd3965d96eee989ec92090d52ae6d1efa285fd

2

Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>

3

AuthorDate: Sat Oct 26 20:13:17 2019 +0000

4

Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>

5

CommitDate: Sat Oct 26 20:13:44 2019 +0000

6

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

7

8

dev-qt/qt-creator: add 4.10.1

9

10

Closes: https://bugs.gentoo.org/695274

11

Package-Manager: Portage-2.3.78, Repoman-2.3.17

12

Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

13

14

 dev-qt/qt-creator/Manifest                           |  1 +

15

 ...-creator-9999.ebuild => qt-creator-4.10.1.ebuild} | 20 ++++++++++----------

16

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

17

 3 files changed, 16 insertions(+), 14 deletions(-)

18

19

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest

20

index fb6e343869e..ef507481f10 100644

21

--- a/dev-qt/qt-creator/Manifest

22

+++ b/dev-qt/qt-creator/Manifest

23

@@ -1,2 +1,3 @@

24

 DIST qt-creator-opensource-src-4.10.0-rc1.tar.xz 26226544 BLAKE2B 5fc66e73d93b2d358c4f3c23e80029b805b1aa841b71fc35077b089bf51d705b6f7f352bd36f2dd573aef0a95efea3573e08af8eea31aeb0f43d33172935cdc1 SHA512 e5f7fb5b67fd803fbcb2a96b26d96e53e5d43fd3733c4867ce9e2f4764220d1772fa788424d917acdc0c78c580ce8ee774e561c6bf5fd54feac320073d5fb263

25

+DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3

26

 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

27

28

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

29

similarity index 90%

30

copy from dev-qt/qt-creator/qt-creator-9999.ebuild

31

copy to dev-qt/qt-creator/qt-creator-4.10.1.ebuild

32

index 6d0e795605f..f161df651cd 100644

33

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

34

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

35

@@ -2,6 +2,7 @@

36

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

37

38

 EAPI=7

39

+LLVM_MAX_SLOT=8

40

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

41

42

 inherit llvm qmake-utils virtualx xdg

43

@@ -25,15 +26,14 @@ fi

44

45

 # TODO: unbundle sqlite and KSyntaxHighlighting

46

47

-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt

48

+QTC_PLUGINS=(android +autotest baremetal bazaar beautifier

49

 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase

50

-	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios

51

-	lsp:languageclient mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor

52

-	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal

53

-	silversearcher subversion valgrind winrt)

54

+	cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient

55

+	mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager

56

+	+qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion

57

+	valgrind winrt)

58

 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"

59

 REQUIRED_USE="

60

-	boot2qt? ( remotelinux )

61

 	clang? ( test? ( qbs ) )

62

 	qnx? ( remotelinux )

63

"

64

@@ -55,7 +55,7 @@ CDEPEND="

65

 	>=dev-qt/qtwidgets-${QT_PV}

66

 	>=dev-qt/qtx11extras-${QT_PV}

67

 	>=dev-qt/qtxml-${QT_PV}

68

-	clang? ( >=sys-devel/clang-8:= )

69

+	clang? ( sys-devel/clang:8= )

70

 	designer? ( >=dev-qt/designer-${QT_PV} )

71

 	help? (

72

 		>=dev-qt/qthelp-${QT_PV}

73

@@ -80,7 +80,7 @@ DEPEND="${CDEPEND}

74

 RDEPEND="${CDEPEND}

75

 	sys-devel/gdb[client,python]

76

 	bazaar? ( dev-vcs/bzr )

77

-	cmake? ( dev-util/cmake[server(+)] )

78

+	cmake? ( dev-util/cmake )

79

 	cppcheck? ( dev-util/cppcheck )

80

 	cvs? ( dev-vcs/cvs )

81

 	git? ( dev-vcs/git )

82

@@ -129,7 +129,7 @@ src_prepare() {

83

fi

84

 	if ! use perfprofiler; then

85

 		rm -rf src/tools/perfparser || die

86

-		if ! use ctfvisualizer && ! use qmlprofiler; then

87

+		if ! use qmlprofiler; then

88

 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die

89

fi

90

fi

91

@@ -173,7 +173,7 @@ src_prepare() {

92

 src_configure() {

93

 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \

94

 		IDE_PACKAGE_MODE=1 \

95

-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \

96

+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \

97

 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \

98

 		CONFIG+=qbs_disable_rpath \

99

 		CONFIG+=qbs_enable_project_file_updates \

100

101

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

102

index 6d0e795605f..2b7b3ee74af 100644

103

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

104

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

105

@@ -2,6 +2,7 @@

106

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

107

108

 EAPI=7

109

+LLVM_MAX_SLOT=8

110

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

111

112

 inherit llvm qmake-utils virtualx xdg

113

@@ -23,7 +24,7 @@ else

114

 	S=${WORKDIR}/${MY_P}

115

fi

116

117

-# TODO: unbundle sqlite and KSyntaxHighlighting

118

+# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting

119

120

 QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt

121

 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase

122

@@ -55,7 +56,7 @@ CDEPEND="

123

 	>=dev-qt/qtwidgets-${QT_PV}

124

 	>=dev-qt/qtx11extras-${QT_PV}

125

 	>=dev-qt/qtxml-${QT_PV}

126

-	clang? ( >=sys-devel/clang-8:= )

127

+	clang? ( sys-devel/clang:8= )

128

 	designer? ( >=dev-qt/designer-${QT_PV} )

129

 	help? (

130

 		>=dev-qt/qthelp-${QT_PV}

131

@@ -80,7 +81,7 @@ DEPEND="${CDEPEND}

132

 RDEPEND="${CDEPEND}

133

 	sys-devel/gdb[client,python]

134

 	bazaar? ( dev-vcs/bzr )

135

-	cmake? ( dev-util/cmake[server(+)] )

136

+	cmake? ( dev-util/cmake )

137

 	cppcheck? ( dev-util/cppcheck )

138

 	cvs? ( dev-vcs/cvs )

139

 	git? ( dev-vcs/git )

140

@@ -173,7 +174,7 @@ src_prepare() {

141

 src_configure() {

142

 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \

143

 		IDE_PACKAGE_MODE=1 \

144

-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \

145

+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \

146

 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \

147

 		CONFIG+=qbs_disable_rpath \

148

 		CONFIG+=qbs_enable_project_file_updates \

1	commit: cdcd3965d96eee989ec92090d52ae6d1efa285fd
2	Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3	AuthorDate: Sat Oct 26 20:13:17 2019 +0000
4	Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5	CommitDate: Sat Oct 26 20:13:44 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcd3965
7
8	dev-qt/qt-creator: add 4.10.1
9
10	Closes: https://bugs.gentoo.org/695274
11	Package-Manager: Portage-2.3.78, Repoman-2.3.17
12	Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
13
14	dev-qt/qt-creator/Manifest \| 1 +
15	...-creator-9999.ebuild => qt-creator-4.10.1.ebuild} \| 20 ++++++++++----------
16	dev-qt/qt-creator/qt-creator-9999.ebuild \| 9 +++++----
17	3 files changed, 16 insertions(+), 14 deletions(-)
18
19	diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
20	index fb6e343869e..ef507481f10 100644
21	--- a/dev-qt/qt-creator/Manifest
22	+++ b/dev-qt/qt-creator/Manifest
23	@@ -1,2 +1,3 @@
24	DIST qt-creator-opensource-src-4.10.0-rc1.tar.xz 26226544 BLAKE2B 5fc66e73d93b2d358c4f3c23e80029b805b1aa841b71fc35077b089bf51d705b6f7f352bd36f2dd573aef0a95efea3573e08af8eea31aeb0f43d33172935cdc1 SHA512 e5f7fb5b67fd803fbcb2a96b26d96e53e5d43fd3733c4867ce9e2f4764220d1772fa788424d917acdc0c78c580ce8ee774e561c6bf5fd54feac320073d5fb263
25	+DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
26	DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
27
28	diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
29	similarity index 90%
30	copy from dev-qt/qt-creator/qt-creator-9999.ebuild
31	copy to dev-qt/qt-creator/qt-creator-4.10.1.ebuild
32	index 6d0e795605f..f161df651cd 100644
33	--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
34	+++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
35	@@ -2,6 +2,7 @@
36	# Distributed under the terms of the GNU General Public License v2
37
38	EAPI=7
39	+LLVM_MAX_SLOT=8
40	PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
41
42	inherit llvm qmake-utils virtualx xdg
43	@@ -25,15 +26,14 @@ fi
44
45	# TODO: unbundle sqlite and KSyntaxHighlighting
46
47	-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
48	+QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
49	'+clang:clangcodemodel\|clangformat\|clangpchmanager\|clangrefactoring\|clangtools' clearcase
50	- cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
51	- lsp:languageclient mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor
52	- qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
53	- silversearcher subversion valgrind winrt)
54	+ cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient
55	+ mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager
56	+ +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
57	+ valgrind winrt)
58	IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
59	REQUIRED_USE="
60	- boot2qt? ( remotelinux )
61	clang? ( test? ( qbs ) )
62	qnx? ( remotelinux )
63	"
64	@@ -55,7 +55,7 @@ CDEPEND="
65	>=dev-qt/qtwidgets-${QT_PV}
66	>=dev-qt/qtx11extras-${QT_PV}
67	>=dev-qt/qtxml-${QT_PV}
68	- clang? ( >=sys-devel/clang-8:= )
69	+ clang? ( sys-devel/clang:8= )
70	designer? ( >=dev-qt/designer-${QT_PV} )
71	help? (
72	>=dev-qt/qthelp-${QT_PV}
73	@@ -80,7 +80,7 @@ DEPEND="${CDEPEND}
74	RDEPEND="${CDEPEND}
75	sys-devel/gdb[client,python]
76	bazaar? ( dev-vcs/bzr )
77	- cmake? ( dev-util/cmake[server(+)] )
78	+ cmake? ( dev-util/cmake )
79	cppcheck? ( dev-util/cppcheck )
80	cvs? ( dev-vcs/cvs )
81	git? ( dev-vcs/git )
82	@@ -129,7 +129,7 @@ src_prepare() {
83	fi
84	if ! use perfprofiler; then
85	rm -rf src/tools/perfparser \|\| die
86	- if ! use ctfvisualizer && ! use qmlprofiler; then
87	+ if ! use qmlprofiler; then
88	sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro \|\| die
89	fi
90	fi
91	@@ -173,7 +173,7 @@ src_prepare() {
92	src_configure() {
93	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
94	IDE_PACKAGE_MODE=1 \
95	- $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
96	+ $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
97	$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
98	CONFIG+=qbs_disable_rpath \
99	CONFIG+=qbs_enable_project_file_updates \
100
101	diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
102	index 6d0e795605f..2b7b3ee74af 100644
103	--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
104	+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
105	@@ -2,6 +2,7 @@
106	# Distributed under the terms of the GNU General Public License v2
107
108	EAPI=7
109	+LLVM_MAX_SLOT=8
110	PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
111
112	inherit llvm qmake-utils virtualx xdg
113	@@ -23,7 +24,7 @@ else
114	S=${WORKDIR}/${MY_P}
115	fi
116
117	-# TODO: unbundle sqlite and KSyntaxHighlighting
118	+# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
119
120	QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
121	'+clang:clangcodemodel\|clangformat\|clangpchmanager\|clangrefactoring\|clangtools' clearcase
122	@@ -55,7 +56,7 @@ CDEPEND="
123	>=dev-qt/qtwidgets-${QT_PV}
124	>=dev-qt/qtx11extras-${QT_PV}
125	>=dev-qt/qtxml-${QT_PV}
126	- clang? ( >=sys-devel/clang-8:= )
127	+ clang? ( sys-devel/clang:8= )
128	designer? ( >=dev-qt/designer-${QT_PV} )
129	help? (
130	>=dev-qt/qthelp-${QT_PV}
131	@@ -80,7 +81,7 @@ DEPEND="${CDEPEND}
132	RDEPEND="${CDEPEND}
133	sys-devel/gdb[client,python]
134	bazaar? ( dev-vcs/bzr )
135	- cmake? ( dev-util/cmake[server(+)] )
136	+ cmake? ( dev-util/cmake )
137	cppcheck? ( dev-util/cppcheck )
138	cvs? ( dev-vcs/cvs )
139	git? ( dev-vcs/git )
140	@@ -173,7 +174,7 @@ src_prepare() {
141	src_configure() {
142	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
143	IDE_PACKAGE_MODE=1 \
144	- $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
145	+ $(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
146	$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
147	CONFIG+=qbs_disable_rpath \
148	CONFIG+=qbs_enable_project_file_updates \

Gentoo Archives: gentoo-commits