[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/ - gentoo-commits

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
Date:	Thu, 02 Jan 2020 22:36:57
Message-Id:	`1578004598.088d47495b72cf9d001f170887ad1e574b01da97.asturm@gentoo`

1

commit:     088d47495b72cf9d001f170887ad1e574b01da97

2

Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

3

AuthorDate: Thu Jan  2 22:35:56 2020 +0000

4

Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

5

CommitDate: Thu Jan  2 22:36:38 2020 +0000

6

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

7

8

media-gfx/gmic: Revert back to cmake-utils.eclass

9

10

Sorry for breaking. It is weird, but not for me to figure out.

11

12

Bug: https://bugs.gentoo.org/704524

13

Package-Manager: Portage-2.3.84, Repoman-2.3.20

14

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

15

16

 media-gfx/gmic/gmic-2.7.0.ebuild | 28 +++++++++++++++-------------

17

 media-gfx/gmic/gmic-2.7.1.ebuild | 28 +++++++++++++++-------------

18

 media-gfx/gmic/gmic-2.7.2.ebuild | 28 +++++++++++++++-------------

19

 3 files changed, 45 insertions(+), 39 deletions(-)

20

21

diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild

22

index a96eb924674..1edb9254ff0 100644

23

--- a/media-gfx/gmic/gmic-2.7.0.ebuild

24

+++ b/media-gfx/gmic/gmic-2.7.0.ebuild

25

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

26

-# Copyright 1999-2019 Gentoo Authors

27

+# Copyright 1999-2020 Gentoo Authors

28

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

29

30

 EAPI=7

31

32

 CMAKE_BUILD_TYPE=Release

33

-inherit cmake bash-completion-r1

34

+CMAKE_MIN_VERSION=3.9

35

+

36

+inherit cmake-utils bash-completion-r1

37

38

 if [[ ${PV} == "9999" ]]; then

39

 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"

40

@@ -79,14 +81,14 @@ pkg_pretend() {

41

42

 src_prepare() {

43

 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )

44

-	cmake_src_prepare

45

+	cmake-utils_src_prepare

46

 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die

47

48

 	if use gimp || use krita || use qt5; then

49

 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die

50

 		local S="${S}/gmic-qt"

51

 		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )

52

-		cmake_src_prepare

53

+		cmake-utils_src_prepare

54

fi

55

}

56

57

@@ -113,7 +115,7 @@ src_configure() {

58

 		-DENABLE_DYNAMIC_LINKING=ON

59

)

60

61

-	cmake_src_configure

62

+	cmake-utils_src_configure

63

64

 	# configure gmic-qt frontends

65

 	local CMAKE_USE_DIR="${S}/gmic-qt"

66

@@ -126,32 +128,32 @@ src_configure() {

67

68

 	if use gimp; then

69

 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )

70

-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure

71

+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure

72

fi

73

74

 	if use krita; then

75

 		mycmakeargs+=( -DGMIC_QT_HOST=krita )

76

-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure

77

+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure

78

fi

79

80

 	if use qt5; then

81

 		mycmakeargs+=( -DGMIC_QT_HOST=none )

82

-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure

83

+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure

84

fi

85

}

86

87

 src_compile() {

88

-	cmake_src_compile

89

+	cmake-utils_src_compile

90

91

 	# build gmic-qt frontends

92

 	local S="${S}/gmic-qt"

93

-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }

94

-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }

95

-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }

96

+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }

97

+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }

98

+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }

99

}

100

101

 src_install() {

102

-	cmake_src_install

103

+	cmake-utils_src_install

104

 	dodoc README

105

 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}

106

107

108

diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild

109

index 81708eba2f7..2a575ef1eb6 100644

110

--- a/media-gfx/gmic/gmic-2.7.1.ebuild

111

+++ b/media-gfx/gmic/gmic-2.7.1.ebuild

112

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

113

-# Copyright 1999-2019 Gentoo Authors

114

+# Copyright 1999-2020 Gentoo Authors

115

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

116

117

 EAPI=7

118

119

 CMAKE_BUILD_TYPE=Release

120

-inherit cmake bash-completion-r1

121

+CMAKE_MIN_VERSION=3.9

122

+

123

+inherit cmake-utils bash-completion-r1

124

125

 if [[ ${PV} == "9999" ]]; then

126

 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"

127

@@ -79,14 +81,14 @@ pkg_pretend() {

128

129

 src_prepare() {

130

 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )

131

-	cmake_src_prepare

132

+	cmake-utils_src_prepare

133

 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die

134

135

 	if use gimp || use krita || use qt5; then

136

 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die

137

 		local S="${S}/gmic-qt"

138

 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )

139

-		cmake_src_prepare

140

+		cmake-utils_src_prepare

141

fi

142

}

143

144

@@ -113,7 +115,7 @@ src_configure() {

145

 		-DENABLE_DYNAMIC_LINKING=ON

146

)

147

148

-	cmake_src_configure

149

+	cmake-utils_src_configure

150

151

 	# configure gmic-qt frontends

152

 	local CMAKE_USE_DIR="${S}/gmic-qt"

153

@@ -126,32 +128,32 @@ src_configure() {

154

155

 	if use gimp; then

156

 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )

157

-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure

158

+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure

159

fi

160

161

 	if use krita; then

162

 		mycmakeargs+=( -DGMIC_QT_HOST=krita )

163

-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure

164

+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure

165

fi

166

167

 	if use qt5; then

168

 		mycmakeargs+=( -DGMIC_QT_HOST=none )

169

-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure

170

+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure

171

fi

172

}

173

174

 src_compile() {

175

-	cmake_src_compile

176

+	cmake-utils_src_compile

177

178

 	# build gmic-qt frontends

179

 	local S="${S}/gmic-qt"

180

-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }

181

-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }

182

-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }

183

+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }

184

+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }

185

+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }

186

}

187

188

 src_install() {

189

-	cmake_src_install

190

+	cmake-utils_src_install

191

 	dodoc README

192

 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}

193

194

195

diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild

196

index 81708eba2f7..2a575ef1eb6 100644

197

--- a/media-gfx/gmic/gmic-2.7.2.ebuild

198

+++ b/media-gfx/gmic/gmic-2.7.2.ebuild

199

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

200

-# Copyright 1999-2019 Gentoo Authors

201

+# Copyright 1999-2020 Gentoo Authors

202

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

203

204

 EAPI=7

205

206

 CMAKE_BUILD_TYPE=Release

207

-inherit cmake bash-completion-r1

208

+CMAKE_MIN_VERSION=3.9

209

+

210

+inherit cmake-utils bash-completion-r1

211

212

 if [[ ${PV} == "9999" ]]; then

213

 	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"

214

@@ -79,14 +81,14 @@ pkg_pretend() {

215

216

 src_prepare() {

217

 	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )

218

-	cmake_src_prepare

219

+	cmake-utils_src_prepare

220

 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die

221

222

 	if use gimp || use krita || use qt5; then

223

 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die

224

 		local S="${S}/gmic-qt"

225

 		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )

226

-		cmake_src_prepare

227

+		cmake-utils_src_prepare

228

fi

229

}

230

231

@@ -113,7 +115,7 @@ src_configure() {

232

 		-DENABLE_DYNAMIC_LINKING=ON

233

)

234

235

-	cmake_src_configure

236

+	cmake-utils_src_configure

237

238

 	# configure gmic-qt frontends

239

 	local CMAKE_USE_DIR="${S}/gmic-qt"

240

@@ -126,32 +128,32 @@ src_configure() {

241

242

 	if use gimp; then

243

 		mycmakeargs+=( -DGMIC_QT_HOST=gimp )

244

-		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure

245

+		BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure

246

fi

247

248

 	if use krita; then

249

 		mycmakeargs+=( -DGMIC_QT_HOST=krita )

250

-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure

251

+		BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure

252

fi

253

254

 	if use qt5; then

255

 		mycmakeargs+=( -DGMIC_QT_HOST=none )

256

-		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure

257

+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure

258

fi

259

}

260

261

 src_compile() {

262

-	cmake_src_compile

263

+	cmake-utils_src_compile

264

265

 	# build gmic-qt frontends

266

 	local S="${S}/gmic-qt"

267

-	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }

268

-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }

269

-	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }

270

+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }

271

+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }

272

+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }

273

}

274

275

 src_install() {

276

-	cmake_src_install

277

+	cmake-utils_src_install

278

 	dodoc README

279

 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}

1	commit: 088d47495b72cf9d001f170887ad1e574b01da97
2	Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3	AuthorDate: Thu Jan 2 22:35:56 2020 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Thu Jan 2 22:36:38 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d4749
7
8	media-gfx/gmic: Revert back to cmake-utils.eclass
9
10	Sorry for breaking. It is weird, but not for me to figure out.
11
12	Bug: https://bugs.gentoo.org/704524
13	Package-Manager: Portage-2.3.84, Repoman-2.3.20
14	Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16	media-gfx/gmic/gmic-2.7.0.ebuild \| 28 +++++++++++++++-------------
17	media-gfx/gmic/gmic-2.7.1.ebuild \| 28 +++++++++++++++-------------
18	media-gfx/gmic/gmic-2.7.2.ebuild \| 28 +++++++++++++++-------------
19	3 files changed, 45 insertions(+), 39 deletions(-)
20
21	diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
22	index a96eb924674..1edb9254ff0 100644
23	--- a/media-gfx/gmic/gmic-2.7.0.ebuild
24	+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
25	@@ -1,10 +1,12 @@
26	-# Copyright 1999-2019 Gentoo Authors
27	+# Copyright 1999-2020 Gentoo Authors
28	# Distributed under the terms of the GNU General Public License v2
29
30	EAPI=7
31
32	CMAKE_BUILD_TYPE=Release
33	-inherit cmake bash-completion-r1
34	+CMAKE_MIN_VERSION=3.9
35	+
36	+inherit cmake-utils bash-completion-r1
37
38	if [[ ${PV} == "9999" ]]; then
39	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
40	@@ -79,14 +81,14 @@ pkg_pretend() {
41
42	src_prepare() {
43	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
44	- cmake_src_prepare
45	+ cmake-utils_src_prepare
46	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt \|\| die
47
48	if use gimp \|\| use krita \|\| use qt5; then
49	sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt \|\| die
50	local S="${S}/gmic-qt"
51	PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
52	- cmake_src_prepare
53	+ cmake-utils_src_prepare
54	fi
55	}
56
57	@@ -113,7 +115,7 @@ src_configure() {
58	-DENABLE_DYNAMIC_LINKING=ON
59	)
60
61	- cmake_src_configure
62	+ cmake-utils_src_configure
63
64	# configure gmic-qt frontends
65	local CMAKE_USE_DIR="${S}/gmic-qt"
66	@@ -126,32 +128,32 @@ src_configure() {
67
68	if use gimp; then
69	mycmakeargs+=( -DGMIC_QT_HOST=gimp )
70	- BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
71	+ BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
72	fi
73
74	if use krita; then
75	mycmakeargs+=( -DGMIC_QT_HOST=krita )
76	- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
77	+ BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
78	fi
79
80	if use qt5; then
81	mycmakeargs+=( -DGMIC_QT_HOST=none )
82	- BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
83	+ BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
84	fi
85	}
86
87	src_compile() {
88	- cmake_src_compile
89	+ cmake-utils_src_compile
90
91	# build gmic-qt frontends
92	local S="${S}/gmic-qt"
93	- use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile \|\| die "failed building gimp plugin" ; }
94	- use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile \|\| die "failed building krita plugin" ; }
95	- use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile \|\| die "failed building qt5 GUI" ; }
96	+ use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile \|\| die "failed building gimp plugin" ; }
97	+ use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile \|\| die "failed building krita plugin" ; }
98	+ use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile \|\| die "failed building qt5 GUI" ; }
99	}
100
101	src_install() {
102	- cmake_src_install
103	+ cmake-utils_src_install
104	dodoc README
105	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
106
107
108	diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
109	index 81708eba2f7..2a575ef1eb6 100644
110	--- a/media-gfx/gmic/gmic-2.7.1.ebuild
111	+++ b/media-gfx/gmic/gmic-2.7.1.ebuild
112	@@ -1,10 +1,12 @@
113	-# Copyright 1999-2019 Gentoo Authors
114	+# Copyright 1999-2020 Gentoo Authors
115	# Distributed under the terms of the GNU General Public License v2
116
117	EAPI=7
118
119	CMAKE_BUILD_TYPE=Release
120	-inherit cmake bash-completion-r1
121	+CMAKE_MIN_VERSION=3.9
122	+
123	+inherit cmake-utils bash-completion-r1
124
125	if [[ ${PV} == "9999" ]]; then
126	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
127	@@ -79,14 +81,14 @@ pkg_pretend() {
128
129	src_prepare() {
130	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
131	- cmake_src_prepare
132	+ cmake-utils_src_prepare
133	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt \|\| die
134
135	if use gimp \|\| use krita \|\| use qt5; then
136	sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt \|\| die
137	local S="${S}/gmic-qt"
138	PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
139	- cmake_src_prepare
140	+ cmake-utils_src_prepare
141	fi
142	}
143
144	@@ -113,7 +115,7 @@ src_configure() {
145	-DENABLE_DYNAMIC_LINKING=ON
146	)
147
148	- cmake_src_configure
149	+ cmake-utils_src_configure
150
151	# configure gmic-qt frontends
152	local CMAKE_USE_DIR="${S}/gmic-qt"
153	@@ -126,32 +128,32 @@ src_configure() {
154
155	if use gimp; then
156	mycmakeargs+=( -DGMIC_QT_HOST=gimp )
157	- BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
158	+ BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
159	fi
160
161	if use krita; then
162	mycmakeargs+=( -DGMIC_QT_HOST=krita )
163	- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
164	+ BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
165	fi
166
167	if use qt5; then
168	mycmakeargs+=( -DGMIC_QT_HOST=none )
169	- BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
170	+ BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
171	fi
172	}
173
174	src_compile() {
175	- cmake_src_compile
176	+ cmake-utils_src_compile
177
178	# build gmic-qt frontends
179	local S="${S}/gmic-qt"
180	- use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile \|\| die "failed building gimp plugin" ; }
181	- use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile \|\| die "failed building krita plugin" ; }
182	- use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile \|\| die "failed building qt5 GUI" ; }
183	+ use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile \|\| die "failed building gimp plugin" ; }
184	+ use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile \|\| die "failed building krita plugin" ; }
185	+ use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile \|\| die "failed building qt5 GUI" ; }
186	}
187
188	src_install() {
189	- cmake_src_install
190	+ cmake-utils_src_install
191	dodoc README
192	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
193
194
195	diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
196	index 81708eba2f7..2a575ef1eb6 100644
197	--- a/media-gfx/gmic/gmic-2.7.2.ebuild
198	+++ b/media-gfx/gmic/gmic-2.7.2.ebuild
199	@@ -1,10 +1,12 @@
200	-# Copyright 1999-2019 Gentoo Authors
201	+# Copyright 1999-2020 Gentoo Authors
202	# Distributed under the terms of the GNU General Public License v2
203
204	EAPI=7
205
206	CMAKE_BUILD_TYPE=Release
207	-inherit cmake bash-completion-r1
208	+CMAKE_MIN_VERSION=3.9
209	+
210	+inherit cmake-utils bash-completion-r1
211
212	if [[ ${PV} == "9999" ]]; then
213	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
214	@@ -79,14 +81,14 @@ pkg_pretend() {
215
216	src_prepare() {
217	local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
218	- cmake_src_prepare
219	+ cmake-utils_src_prepare
220	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt \|\| die
221
222	if use gimp \|\| use krita \|\| use qt5; then
223	sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt \|\| die
224	local S="${S}/gmic-qt"
225	PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
226	- cmake_src_prepare
227	+ cmake-utils_src_prepare
228	fi
229	}
230
231	@@ -113,7 +115,7 @@ src_configure() {
232	-DENABLE_DYNAMIC_LINKING=ON
233	)
234
235	- cmake_src_configure
236	+ cmake-utils_src_configure
237
238	# configure gmic-qt frontends
239	local CMAKE_USE_DIR="${S}/gmic-qt"
240	@@ -126,32 +128,32 @@ src_configure() {
241
242	if use gimp; then
243	mycmakeargs+=( -DGMIC_QT_HOST=gimp )
244	- BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
245	+ BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
246	fi
247
248	if use krita; then
249	mycmakeargs+=( -DGMIC_QT_HOST=krita )
250	- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
251	+ BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
252	fi
253
254	if use qt5; then
255	mycmakeargs+=( -DGMIC_QT_HOST=none )
256	- BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
257	+ BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
258	fi
259	}
260
261	src_compile() {
262	- cmake_src_compile
263	+ cmake-utils_src_compile
264
265	# build gmic-qt frontends
266	local S="${S}/gmic-qt"
267	- use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile \|\| die "failed building gimp plugin" ; }
268	- use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile \|\| die "failed building krita plugin" ; }
269	- use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile \|\| die "failed building qt5 GUI" ; }
270	+ use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile \|\| die "failed building gimp plugin" ; }
271	+ use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile \|\| die "failed building krita plugin" ; }
272	+ use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile \|\| die "failed building qt5 GUI" ; }
273	}
274
275	src_install() {
276	- cmake_src_install
277	+ cmake-utils_src_install
278	dodoc README
279	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}

Gentoo Archives: gentoo-commits