[gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/, sci-libs/dcmtk/files/ - gentoo-commits

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/, sci-libs/dcmtk/files/
Date:	Sun, 26 Aug 2018 18:24:19
Message-Id:	`1535307830.5d9f59c5a0b2ae5e8f388bf4c8157cfc7e1546f2.asturm@gentoo`

1

commit:     5d9f59c5a0b2ae5e8f388bf4c8157cfc7e1546f2

2

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

3

AuthorDate: Sun Aug 26 18:14:15 2018 +0000

4

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

5

CommitDate: Sun Aug 26 18:23:50 2018 +0000

6

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

7

8

sci-libs/dcmtk: 3.6.3 version bump, EAPI-6, openssl-1.1 compat

9

10

Package-Manager: Portage-2.3.48, Repoman-2.3.10

11

12

 sci-libs/dcmtk/Manifest                            |   1 +

13

 sci-libs/dcmtk/dcmtk-3.6.3.ebuild                  |  91 +++++++++++

14

 sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch |  87 +++++++++++

15

 sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch     | 171 +++++++++++++++++++++

16

 4 files changed, 350 insertions(+)

17

18

diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest

19

index 0836ea2fcb2..dd9494962b5 100644

20

--- a/sci-libs/dcmtk/Manifest

21

+++ b/sci-libs/dcmtk/Manifest

22

@@ -1 +1,2 @@

23

 DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c

24

+DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8

25

26

diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild

27

new file mode 100644

28

index 00000000000..463fca72dfb

29

--- /dev/null

30

+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild

31

@@ -0,0 +1,91 @@

32

+# Copyright 1999-2018 Gentoo Foundation

33

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

34

+

35

+EAPI=6

36

+

37

+inherit cmake-utils

38

+

39

+DESCRIPTION="The DICOM Toolkit"

40

+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"

41

+SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/${PN}/${PN}363/${P}.tar.gz"

42

+

43

+LICENSE="OFFIS"

44

+KEYWORDS="~amd64 ~arm ~x86"

45

+SLOT="0"

46

+IUSE="doc png ssl tcpd tiff +threads xml zlib"

47

+

48

+RDEPEND="

49

+	dev-libs/icu:=

50

+	virtual/jpeg:0

51

+	png? ( media-libs/libpng:* )

52

+	ssl? ( dev-libs/openssl:0= )

53

+	tcpd? ( sys-apps/tcp-wrappers )

54

+	tiff? ( media-libs/tiff:0 )

55

+	xml? ( dev-libs/libxml2:2 )

56

+	zlib? ( sys-libs/zlib )"

57

+DEPEND="${RDEPEND}

58

+	media-gfx/graphviz

59

+	doc? ( app-doc/doxygen )"

60

+

61

+PATCHES=(

62

+	"${FILESDIR}"/${P}-dcmqrdb-cfg.patch

63

+	"${FILESDIR}"/${P}-nostrip.patch

64

+)

65

+

66

+src_prepare() {

67

+	cmake-utils_src_prepare

68

+

69

+	sed -e "s:share/doc/dcmtk:&-${PV}:" \

70

+		-e "s:DIR \"/:DIR \"/usr/:" \

71

+		-e "s:usr/etc:etc:" \

72

+		-e "s:/lib\":/$(get_libdir)\":" \

73

+		-e "s:COPYRIGHT::" \

74

+		-i CMakeLists.txt || die

75

+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \

76

+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die

77

+	# Temporary workaround: docs are not built with CMake

78

+	sed -i -e '/include/d' doxygen/Makefile.in || die

79

+

80

+	# fix -D deprecation warnings

81

+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \

82

+		"${S}"/config/configure.in \

83

+		"${S}"/CMakeLists.txt || die

84

+}

85

+

86

+src_configure() {

87

+	local mycmakeargs=(

88

+		-DBUILD_SHARED_LIBS=ON

89

+		-DDCMTK_WITH_ICU=ON

90

+		-DDCMTK_WITH_TIFF=$(usex tiff)

91

+		-DDCMTK_WITH_PNG=$(usex png)

92

+		-DDCMTK_WITH_XML=$(usex xml)

93

+		-DDCMTK_WITH_ZLIB=$(usex zlib)

94

+		-DDCMTK_WITH_OPENSSL=$(usex ssl)

95

+		-DDCMTK_WITH_DOXYGEN=$(usex doc)

96

+		-DDCMTK_WITH_THREADS=$(usex threads)

97

+	)

98

+

99

+	cmake-utils_src_configure

100

+

101

+	if use doc; then

102

+		cd "${S}"/doxygen || die

103

+		econf

104

+	fi

105

+}

106

+

107

+src_compile() {

108

+	cmake-utils_src_compile

109

+

110

+	if use doc; then

111

+		emake -C "${S}"/doxygen

112

+	fi

113

+}

114

+

115

+src_install() {

116

+	doman doxygen/manpages/man1/*

117

+

118

+	if use doc; then

119

+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )

120

+	fi

121

+	cmake-utils_src_install

122

+}

123

124

diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch

125

new file mode 100644

126

index 00000000000..4ccb58d4e34

127

--- /dev/null

128

+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch

129

@@ -0,0 +1,87 @@

130

+Author: Jürgen Salk <jsa@××××××.org>

131

+Description: The original maintainer Jürgen Salk applied

132

+ a set of patches to the original code.  This file contains

133

+ changes to C++ code

134

+

135

+Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg

136

+===================================================================

137

+--- a/dcmqrdb/etc/dcmqrscp.cfg	2010-09-09 19:20:25.000000000 +0200

138

++++ b/dcmqrdb/etc/dcmqrscp.cfg	2011-01-28 09:49:02.000000000 +0100

139

+@@ -10,7 +10,9 @@

140

+ NetworkTCPPort  = 104

141

+ MaxPDUSize      = 16384

142

+ MaxAssociations = 16

143

++UserName        = "dcmtk"

144

++GroupName       = "dcmtk"

145

+

146

+ #

147

+ # Default settings for specific character set behavior:

148

+ # SpecificCharacterSet = fallback

149

+@@ -28,12 +30,13 @@

150

+ # NOTE: in the current implementation you cannot substitute an IP address

151

+ # for a hostname.

152

+ #

153

+-acme1           = (ACME1, acmehost1, 5678)

154

+-acme2           = (ACME2, acmehost2, 5678)

155

+-acmeCTcompany   = acme1, acme2

156

+-united1         = (UNITED1, unitedhost1, 104)

157

+-united2         = (UNITED2, unitedhost2, 104)

158

+-unitedMRcompany = united1, united2

159

++# Example:

160

++#acme1           = (ACME1, acmehost1, 5678)

161

++#acme2           = (ACME2, acmehost2, 5678)

162

++#acmeCTcompany   = acme1, acme2

163

++#united1         = (UNITED1, unitedhost1, 104)

164

++#united2         = (UNITED2, unitedhost2, 104)

165

++#unitedMRcompany = united1, united2

166

+ #

167

+ HostTable END

168

+

169

+@@ -51,8 +54,9 @@

170

+ #       VendorName = SymbolicName

171

+ # The symbolic name should be defined in the HostTable.

172

+ #

173

+-"Acme CT Company"   = acmeCTcompany

174

+-"United MR Company" = unitedMRcompany

175

++# Example:

176

++#"Acme CT Company"   = acmeCTcompany

177

++#"United MR Company" = unitedMRcompany

178

+ #

179

+ VendorTable END

180

+

181

+@@ -70,8 +74,13 @@

182

+ #               Entry in HostTable                      |

183

+ #               ANY

184

+ #

185

+-COMMON       /home/dicom/db/COMMON       R  (200, 1024mb) ANY

186

+-ACME_STORE   /home/dicom/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany

187

+-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany

188

++# Example:

189

++#

190

++#ACME_STORE   /var/lib/dcmtk/db/ACME_STORE   RW (9, 1024mb)   acmeCTcompany

191

++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb)   unitedMRcompany

192

++#

193

++# Uncomment and adjust the following lines for a common r/rw storage area:

194

++#READWRITE     /var/lib/dcmtk/db/READWRITE    RW (10, 1024mb)  ANY

195

++#READ          /var/lib/dcmtk/db/READ         R  (200, 1024mb) ANY

196

+ #

197

+ AETable END

198

+Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt

199

+--- a/dcmqrdb/docs/dcmqrcnf.txt	2010-09-09 19:20:12.000000000 +0200

200

++++ b/dcmqrdb/docs/dcmqrcnf.txt	2011-01-28 09:46:02.000000000 +0100

201

+@@ -44,8 +44,8 @@

202

+ MaxPDUSize           = 8192

203

+ MaxAssociations      = 20

204

+ SpecificCharacterSet = fallback

205

+-UserName             = (do not change user)

206

+-GroupName            = (do not change group)

207

++UserName             = "dcmtk"

208

++GroupName            = "dcmtk"

209

+

210

+ Available options for specific character sets are:

211

+

212

+Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile

213

+--- /dev/null	1970-01-01 00:00:00.000000000 +0000

214

++++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile	2011-01-28 09:46:02.000000000 +0100

215

+@@ -0,0 +1 @@

216

++

217

218

diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch

219

new file mode 100644

220

index 00000000000..83bd3a62fd9

221

--- /dev/null

222

+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch

223

@@ -0,0 +1,171 @@

224

+Remove all hardcoded calls to `strip` command

225

+

226

+Index: dcmtk-3.6.0/config/templates/Makefile.src

227

+===================================================================

228

+--- a/config/templates/Makefile.src	2009-01-30 10:27:58.000000000 +0100

229

++++ b/config/templates/Makefile.src	2011-01-28 09:53:28.000000000 +0100

230

+@@ -31,7 +31,7 @@

231

+ install-bin: all

232

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

233

+ 	for prog in $(progs); do \

234

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

235

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

236

+ 	done

237

+

238

+

239

+Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in

240

+===================================================================

241

+--- a/dcmdata/apps/Makefile.in	2009-11-04 10:58:05.000000000 +0100

242

++++ b/dcmdata/apps/Makefile.in	2011-01-28 09:53:45.000000000 +0100

243

+@@ -76,7 +76,7 @@

244

+ install-bin: all

245

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

246

+ 	for prog in $(progs); do \

247

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

248

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

249

+ 	done

250

+

251

+

252

+Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in

253

+===================================================================

254

+--- a/dcmimage/apps/Makefile.in	2009-10-13 16:08:33.000000000 +0200

255

++++ b/dcmimage/apps/Makefile.in	2011-01-28 09:53:59.000000000 +0100

256

+@@ -42,7 +42,7 @@

257

+ install: all

258

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

259

+ 	for prog in $(progs); do \

260

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

261

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

262

+ 	done

263

+

264

+

265

+Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in

266

+===================================================================

267

+--- a/dcmimgle/apps/Makefile.in	2009-10-28 10:53:39.000000000 +0100

268

++++ b/dcmimgle/apps/Makefile.in	2011-01-28 09:54:11.000000000 +0100

269

+@@ -39,7 +39,7 @@

270

+ install: all

271

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

272

+ 	for prog in $(progs); do \

273

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

274

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

275

+ 	done

276

+

277

+

278

+Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in

279

+===================================================================

280

+--- a/dcmjpeg/apps/Makefile.in	2009-10-07 14:44:33.000000000 +0200

281

++++ b/dcmjpeg/apps/Makefile.in	2011-01-28 09:54:28.000000000 +0100

282

+@@ -72,7 +72,7 @@

283

+ install: all

284

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

285

+ 	for prog in $(progs); do \

286

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

287

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

288

+ 	done

289

+

290

+ clean:

291

+Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in

292

+===================================================================

293

+--- a/dcmnet/apps/Makefile.in	2009-11-04 11:24:29.000000000 +0100

294

++++ b/dcmnet/apps/Makefile.in	2011-01-28 09:54:50.000000000 +0100

295

+@@ -52,7 +52,7 @@

296

+ install: all

297

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

298

+ 	for prog in $(progs); do \

299

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

300

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

301

+ 	done

302

+

303

+

304

+Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in

305

+===================================================================

306

+--- a/dcmpstat/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200

307

++++ b/dcmpstat/apps/Makefile.in	2011-01-28 09:55:10.000000000 +0100

308

+@@ -113,7 +113,7 @@

309

+ install: all

310

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

311

+ 	for prog in $(progs); do \

312

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

313

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

314

+ 	done

315

+

316

+

317

+Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in

318

+===================================================================

319

+--- a/dcmqrdb/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100

320

++++ b/dcmqrdb/apps/Makefile.in	2011-01-28 09:55:24.000000000 +0100

321

+@@ -57,7 +57,7 @@

322

+ install: all

323

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

324

+ 	for prog in $(progs); do \

325

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

326

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

327

+ 	done

328

+

329

+

330

+Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in

331

+===================================================================

332

+--- a/dcmsign/apps/Makefile.in	2009-09-04 17:42:31.000000000 +0200

333

++++ b/dcmsign/apps/Makefile.in	2011-01-28 09:55:35.000000000 +0100

334

+@@ -33,7 +33,7 @@

335

+ install: all

336

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

337

+ 	for prog in $(progs); do \

338

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

339

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

340

+ 	done

341

+

342

+

343

+Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in

344

+===================================================================

345

+--- a/dcmsr/apps/Makefile.in	2009-10-13 16:57:49.000000000 +0200

346

++++ b/dcmsr/apps/Makefile.in	2011-01-28 09:55:48.000000000 +0100

347

+@@ -44,7 +44,7 @@

348

+ install-bin: all

349

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

350

+ 	for prog in $(progs); do \

351

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

352

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

353

+ 	done

354

+

355

+

356

+Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in

357

+===================================================================

358

+--- a/dcmwlm/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100

359

++++ b/dcmwlm/apps/Makefile.in	2011-01-28 09:55:58.000000000 +0100

360

+@@ -49,7 +49,7 @@

361

+ install: all

362

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

363

+ 	for prog in $(progs); do \

364

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

365

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

366

+ 	done

367

+

368

+

369

+Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in

370

+===================================================================

371

+--- a/dcmrt/apps/Makefile.in	2009-11-04 11:24:30.000000000 +0100

372

++++ b/dcmrt/apps/Makefile.in	2011-01-28 09:56:33.000000000 +0100

373

+@@ -55,7 +55,7 @@

374

+ install-bin: all

375

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

376

+ 	for prog in $(progs); do \

377

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

378

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

379

+ 	done

380

+

381

+

382

+Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in

383

+===================================================================

384

+--- a/dcmjpls/apps/Makefile.in	2011-01-28 09:56:54.000000000 +0100

385

++++ b/dcmjpls/apps/Makefile.in	2011-01-28 09:57:00.000000000 +0100

386

+@@ -71,7 +71,7 @@

387

+ install: all

388

+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(bindir)

389

+ 	for prog in $(progs); do \

390

+-		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\

391

++		$(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\

392

+ 	done

393

+

394

+

1	commit: 5d9f59c5a0b2ae5e8f388bf4c8157cfc7e1546f2
2	Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3	AuthorDate: Sun Aug 26 18:14:15 2018 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Sun Aug 26 18:23:50 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9f59c5
7
8	sci-libs/dcmtk: 3.6.3 version bump, EAPI-6, openssl-1.1 compat
9
10	Package-Manager: Portage-2.3.48, Repoman-2.3.10
11
12	sci-libs/dcmtk/Manifest \| 1 +
13	sci-libs/dcmtk/dcmtk-3.6.3.ebuild \| 91 +++++++++++
14	sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch \| 87 +++++++++++
15	sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch \| 171 +++++++++++++++++++++
16	4 files changed, 350 insertions(+)
17
18	diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
19	index 0836ea2fcb2..dd9494962b5 100644
20	--- a/sci-libs/dcmtk/Manifest
21	+++ b/sci-libs/dcmtk/Manifest
22	@@ -1 +1,2 @@
23	DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c
24	+DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
25
26	diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
27	new file mode 100644
28	index 00000000000..463fca72dfb
29	--- /dev/null
30	+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
31	@@ -0,0 +1,91 @@
32	+# Copyright 1999-2018 Gentoo Foundation
33	+# Distributed under the terms of the GNU General Public License v2
34	+
35	+EAPI=6
36	+
37	+inherit cmake-utils
38	+
39	+DESCRIPTION="The DICOM Toolkit"
40	+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
41	+SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/${PN}/${PN}363/${P}.tar.gz"
42	+
43	+LICENSE="OFFIS"
44	+KEYWORDS="~amd64 ~arm ~x86"
45	+SLOT="0"
46	+IUSE="doc png ssl tcpd tiff +threads xml zlib"
47	+
48	+RDEPEND="
49	+ dev-libs/icu:=
50	+ virtual/jpeg:0
51	+ png? ( media-libs/libpng:* )
52	+ ssl? ( dev-libs/openssl:0= )
53	+ tcpd? ( sys-apps/tcp-wrappers )
54	+ tiff? ( media-libs/tiff:0 )
55	+ xml? ( dev-libs/libxml2:2 )
56	+ zlib? ( sys-libs/zlib )"
57	+DEPEND="${RDEPEND}
58	+ media-gfx/graphviz
59	+ doc? ( app-doc/doxygen )"
60	+
61	+PATCHES=(
62	+ "${FILESDIR}"/${P}-dcmqrdb-cfg.patch
63	+ "${FILESDIR}"/${P}-nostrip.patch
64	+)
65	+
66	+src_prepare() {
67	+ cmake-utils_src_prepare
68	+
69	+ sed -e "s:share/doc/dcmtk:&-${PV}:" \
70	+ -e "s:DIR \"/:DIR \"/usr/:" \
71	+ -e "s:usr/etc:etc:" \
72	+ -e "s:/lib\":/$(get_libdir)\":" \
73	+ -e "s:COPYRIGHT::" \
74	+ -i CMakeLists.txt \|\| die
75	+ sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
76	+ -i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt \|\| die
77	+ # Temporary workaround: docs are not built with CMake
78	+ sed -i -e '/include/d' doxygen/Makefile.in \|\| die
79	+
80	+ # fix -D deprecation warnings
81	+ sed -i -e "s\|_BSD_SOURCE\|_DEFAULT_SOURCE\|g" \
82	+ "${S}"/config/configure.in \
83	+ "${S}"/CMakeLists.txt \|\| die
84	+}
85	+
86	+src_configure() {
87	+ local mycmakeargs=(
88	+ -DBUILD_SHARED_LIBS=ON
89	+ -DDCMTK_WITH_ICU=ON
90	+ -DDCMTK_WITH_TIFF=$(usex tiff)
91	+ -DDCMTK_WITH_PNG=$(usex png)
92	+ -DDCMTK_WITH_XML=$(usex xml)
93	+ -DDCMTK_WITH_ZLIB=$(usex zlib)
94	+ -DDCMTK_WITH_OPENSSL=$(usex ssl)
95	+ -DDCMTK_WITH_DOXYGEN=$(usex doc)
96	+ -DDCMTK_WITH_THREADS=$(usex threads)
97	+ )
98	+
99	+ cmake-utils_src_configure
100	+
101	+ if use doc; then
102	+ cd "${S}"/doxygen \|\| die
103	+ econf
104	+ fi
105	+}
106	+
107	+src_compile() {
108	+ cmake-utils_src_compile
109	+
110	+ if use doc; then
111	+ emake -C "${S}"/doxygen
112	+ fi
113	+}
114	+
115	+src_install() {
116	+ doman doxygen/manpages/man1/*
117	+
118	+ if use doc; then
119	+ local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
120	+ fi
121	+ cmake-utils_src_install
122	+}
123
124	diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
125	new file mode 100644
126	index 00000000000..4ccb58d4e34
127	--- /dev/null
128	+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-dcmqrdb-cfg.patch
129	@@ -0,0 +1,87 @@
130	+Author: Jürgen Salk <jsa@××××××.org>
131	+Description: The original maintainer Jürgen Salk applied
132	+ a set of patches to the original code. This file contains
133	+ changes to C++ code
134	+
135	+Index: dcmtk-3.6.0/dcmqrdb/etc/dcmqrscp.cfg
136	+===================================================================
137	+--- a/dcmqrdb/etc/dcmqrscp.cfg 2010-09-09 19:20:25.000000000 +0200
138	++++ b/dcmqrdb/etc/dcmqrscp.cfg 2011-01-28 09:49:02.000000000 +0100
139	+@@ -10,7 +10,9 @@
140	+ NetworkTCPPort = 104
141	+ MaxPDUSize = 16384
142	+ MaxAssociations = 16
143	++UserName = "dcmtk"
144	++GroupName = "dcmtk"
145	+
146	+ #
147	+ # Default settings for specific character set behavior:
148	+ # SpecificCharacterSet = fallback
149	+@@ -28,12 +30,13 @@
150	+ # NOTE: in the current implementation you cannot substitute an IP address
151	+ # for a hostname.
152	+ #
153	+-acme1 = (ACME1, acmehost1, 5678)
154	+-acme2 = (ACME2, acmehost2, 5678)
155	+-acmeCTcompany = acme1, acme2
156	+-united1 = (UNITED1, unitedhost1, 104)
157	+-united2 = (UNITED2, unitedhost2, 104)
158	+-unitedMRcompany = united1, united2
159	++# Example:
160	++#acme1 = (ACME1, acmehost1, 5678)
161	++#acme2 = (ACME2, acmehost2, 5678)
162	++#acmeCTcompany = acme1, acme2
163	++#united1 = (UNITED1, unitedhost1, 104)
164	++#united2 = (UNITED2, unitedhost2, 104)
165	++#unitedMRcompany = united1, united2
166	+ #
167	+ HostTable END
168	+
169	+@@ -51,8 +54,9 @@
170	+ # VendorName = SymbolicName
171	+ # The symbolic name should be defined in the HostTable.
172	+ #
173	+-"Acme CT Company" = acmeCTcompany
174	+-"United MR Company" = unitedMRcompany
175	++# Example:
176	++#"Acme CT Company" = acmeCTcompany
177	++#"United MR Company" = unitedMRcompany
178	+ #
179	+ VendorTable END
180	+
181	+@@ -70,8 +74,13 @@
182	+ # Entry in HostTable \|
183	+ # ANY
184	+ #
185	+-COMMON /home/dicom/db/COMMON R (200, 1024mb) ANY
186	+-ACME_STORE /home/dicom/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
187	+-UNITED_STORE /home/dicom/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
188	++# Example:
189	++#
190	++#ACME_STORE /var/lib/dcmtk/db/ACME_STORE RW (9, 1024mb) acmeCTcompany
191	++#UNITED_STORE /var/lib/dcmtk/db/UNITED_STORE RW (9, 1024mb) unitedMRcompany
192	++#
193	++# Uncomment and adjust the following lines for a common r/rw storage area:
194	++#READWRITE /var/lib/dcmtk/db/READWRITE RW (10, 1024mb) ANY
195	++#READ /var/lib/dcmtk/db/READ R (200, 1024mb) ANY
196	+ #
197	+ AETable END
198	+Index: dcmtk-3.6.0/dcmqrdb/docs/dcmqrcnf.txt
199	+--- a/dcmqrdb/docs/dcmqrcnf.txt 2010-09-09 19:20:12.000000000 +0200
200	++++ b/dcmqrdb/docs/dcmqrcnf.txt 2011-01-28 09:46:02.000000000 +0100
201	+@@ -44,8 +44,8 @@
202	+ MaxPDUSize = 8192
203	+ MaxAssociations = 20
204	+ SpecificCharacterSet = fallback
205	+-UserName = (do not change user)
206	+-GroupName = (do not change group)
207	++UserName = "dcmtk"
208	++GroupName = "dcmtk"
209	+
210	+ Available options for specific character sets are:
211	+
212	+Index: dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile
213	+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
214	++++ dcmtk-3.6.0/dcmwlm/wlistdb/OFFIS/lockfile 2011-01-28 09:46:02.000000000 +0100
215	+@@ -0,0 +1 @@
216	++
217
218	diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
219	new file mode 100644
220	index 00000000000..83bd3a62fd9
221	--- /dev/null
222	+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-nostrip.patch
223	@@ -0,0 +1,171 @@
224	+Remove all hardcoded calls to `strip` command
225	+
226	+Index: dcmtk-3.6.0/config/templates/Makefile.src
227	+===================================================================
228	+--- a/config/templates/Makefile.src 2009-01-30 10:27:58.000000000 +0100
229	++++ b/config/templates/Makefile.src 2011-01-28 09:53:28.000000000 +0100
230	+@@ -31,7 +31,7 @@
231	+ install-bin: all
232	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
233	+ for prog in $(progs); do \
234	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
235	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
236	+ done
237	+
238	+
239	+Index: dcmtk-3.6.0/dcmdata/apps/Makefile.in
240	+===================================================================
241	+--- a/dcmdata/apps/Makefile.in 2009-11-04 10:58:05.000000000 +0100
242	++++ b/dcmdata/apps/Makefile.in 2011-01-28 09:53:45.000000000 +0100
243	+@@ -76,7 +76,7 @@
244	+ install-bin: all
245	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
246	+ for prog in $(progs); do \
247	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
248	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
249	+ done
250	+
251	+
252	+Index: dcmtk-3.6.0/dcmimage/apps/Makefile.in
253	+===================================================================
254	+--- a/dcmimage/apps/Makefile.in 2009-10-13 16:08:33.000000000 +0200
255	++++ b/dcmimage/apps/Makefile.in 2011-01-28 09:53:59.000000000 +0100
256	+@@ -42,7 +42,7 @@
257	+ install: all
258	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
259	+ for prog in $(progs); do \
260	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
261	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
262	+ done
263	+
264	+
265	+Index: dcmtk-3.6.0/dcmimgle/apps/Makefile.in
266	+===================================================================
267	+--- a/dcmimgle/apps/Makefile.in 2009-10-28 10:53:39.000000000 +0100
268	++++ b/dcmimgle/apps/Makefile.in 2011-01-28 09:54:11.000000000 +0100
269	+@@ -39,7 +39,7 @@
270	+ install: all
271	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
272	+ for prog in $(progs); do \
273	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
274	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
275	+ done
276	+
277	+
278	+Index: dcmtk-3.6.0/dcmjpeg/apps/Makefile.in
279	+===================================================================
280	+--- a/dcmjpeg/apps/Makefile.in 2009-10-07 14:44:33.000000000 +0200
281	++++ b/dcmjpeg/apps/Makefile.in 2011-01-28 09:54:28.000000000 +0100
282	+@@ -72,7 +72,7 @@
283	+ install: all
284	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
285	+ for prog in $(progs); do \
286	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
287	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
288	+ done
289	+
290	+ clean:
291	+Index: dcmtk-3.6.0/dcmnet/apps/Makefile.in
292	+===================================================================
293	+--- a/dcmnet/apps/Makefile.in 2009-11-04 11:24:29.000000000 +0100
294	++++ b/dcmnet/apps/Makefile.in 2011-01-28 09:54:50.000000000 +0100
295	+@@ -52,7 +52,7 @@
296	+ install: all
297	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
298	+ for prog in $(progs); do \
299	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
300	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
301	+ done
302	+
303	+
304	+Index: dcmtk-3.6.0/dcmpstat/apps/Makefile.in
305	+===================================================================
306	+--- a/dcmpstat/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200
307	++++ b/dcmpstat/apps/Makefile.in 2011-01-28 09:55:10.000000000 +0100
308	+@@ -113,7 +113,7 @@
309	+ install: all
310	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
311	+ for prog in $(progs); do \
312	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
313	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
314	+ done
315	+
316	+
317	+Index: dcmtk-3.6.0/dcmqrdb/apps/Makefile.in
318	+===================================================================
319	+--- a/dcmqrdb/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
320	++++ b/dcmqrdb/apps/Makefile.in 2011-01-28 09:55:24.000000000 +0100
321	+@@ -57,7 +57,7 @@
322	+ install: all
323	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
324	+ for prog in $(progs); do \
325	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
326	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
327	+ done
328	+
329	+
330	+Index: dcmtk-3.6.0/dcmsign/apps/Makefile.in
331	+===================================================================
332	+--- a/dcmsign/apps/Makefile.in 2009-09-04 17:42:31.000000000 +0200
333	++++ b/dcmsign/apps/Makefile.in 2011-01-28 09:55:35.000000000 +0100
334	+@@ -33,7 +33,7 @@
335	+ install: all
336	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
337	+ for prog in $(progs); do \
338	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
339	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
340	+ done
341	+
342	+
343	+Index: dcmtk-3.6.0/dcmsr/apps/Makefile.in
344	+===================================================================
345	+--- a/dcmsr/apps/Makefile.in 2009-10-13 16:57:49.000000000 +0200
346	++++ b/dcmsr/apps/Makefile.in 2011-01-28 09:55:48.000000000 +0100
347	+@@ -44,7 +44,7 @@
348	+ install-bin: all
349	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
350	+ for prog in $(progs); do \
351	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
352	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
353	+ done
354	+
355	+
356	+Index: dcmtk-3.6.0/dcmwlm/apps/Makefile.in
357	+===================================================================
358	+--- a/dcmwlm/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
359	++++ b/dcmwlm/apps/Makefile.in 2011-01-28 09:55:58.000000000 +0100
360	+@@ -49,7 +49,7 @@
361	+ install: all
362	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
363	+ for prog in $(progs); do \
364	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
365	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
366	+ done
367	+
368	+
369	+Index: dcmtk-3.6.0/dcmwlm/wwwapps/Makefile.in
370	+===================================================================
371	+--- a/dcmrt/apps/Makefile.in 2009-11-04 11:24:30.000000000 +0100
372	++++ b/dcmrt/apps/Makefile.in 2011-01-28 09:56:33.000000000 +0100
373	+@@ -55,7 +55,7 @@
374	+ install-bin: all
375	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
376	+ for prog in $(progs); do \
377	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
378	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
379	+ done
380	+
381	+
382	+Index: dcmtk-3.6.0/dcmjpls/apps/Makefile.in
383	+===================================================================
384	+--- a/dcmjpls/apps/Makefile.in 2011-01-28 09:56:54.000000000 +0100
385	++++ b/dcmjpls/apps/Makefile.in 2011-01-28 09:57:00.000000000 +0100
386	+@@ -71,7 +71,7 @@
387	+ install: all
388	+ $(configdir)/mkinstalldirs $(DESTDIR)$(bindir)
389	+ for prog in $(progs); do \
390	+- $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir) && $(STRIP) $(DESTDIR)$(bindir)/$$prog$(BINEXT) ;\
391	++ $(INSTALL_PROGRAM) $$prog$(BINEXT) $(DESTDIR)$(bindir);\
392	+ done
393	+
394	+

Gentoo Archives: gentoo-commits