gentoo resync : 18.08.2019

2 files changed, 89 insertions, 0 deletions

diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index b5ed7ad53ea0..ec8c397ecb60 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -2,5 +2,7 @@ AUX dcmtk-3.6.3-dcmqrdb-cfg.patch 3031 BLAKE2B 9fd21949e42c7f0c479db7d9b81c13383
 AUX dcmtk-3.6.3-fix-gcc9.patch 2620 BLAKE2B 101faae609065ab9e37a4b9edd1363562a4b86a6bca0f7e9cce5d85aeb2aca6f8e61761657ee31eaa64c8a1c3c9b8d64af950b5d7988f66c393c96a46e4c0232 SHA512 f2de58f58234ab1a7ccfb5c2dd04e3a46f71a8875f32fd1aa8d139e14527d34624686a967d087040281c5dc3a62266321384a4dc9504562f117fdcde1321bf4a
 AUX dcmtk-3.6.3-nostrip.patch 7049 BLAKE2B 57d7b4d2cc3bdd683cb6c51c6d9c7e37023ddaf255655cf3f6c1473484d4e41d4a75b3bcb452a3caa06b8c751cfca47a14b0cd10372c1ebde936f7dec3046ed0 SHA512 00f28de0995c2d38b32b59298ac1c97878248647d403df86244d16a16cfd4c7ba47e7fe400592e5ac0f935a3704733a768fa3b94c9625903e86ab5f714d093bd
 DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
+DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 2d362789e7819089b7da46a9601fa5d53b8e8aab1ac7d30bf1180b3da0645d015a177c97188dc9255c6962a9d7246cf287b20824a78fbe9612b9bc277e68d294 SHA512 735f85d04410437a5163b154f43c8a299aff7a8f810605ce6c5027ae4569ff1323a69f70a2603805cec9d826a31166fd904bb53c3edc1137bfc41ba2902c2261
 EBUILD dcmtk-3.6.3.ebuild 2039 BLAKE2B 655b3b3d424ebdba0d96f629b2308d1bd5650c03ebf48e575f05a8a9c3295928aff91cf34086b1a2f19a41907ff4811394f6c4622f3fd0ba3b2501dbe5a44d2c SHA512 7b92fda743f4ad39112f440b63db6549547a0e12510b9feb2c2a04cbea1a96db49d3c4ee04a8bf4e61bf500c0a94325332a997cc1f5f2434040b1b6a59b24211
+EBUILD dcmtk-3.6.4-r1.ebuild 1931 BLAKE2B 03b414dc9a763d562598760d9adae6f0ddea24431e13dbc517197ce84e4cf4261edd702b68398040674a7e11bc48b3b21b2564993d579902e40e914c75da1149 SHA512 6cb6d226886c6b7d29366986f6ce319d45f4f96d61b8c794cddcc1867bc8aa3518474c23b8c56e51e6d81bad03fbe309fa06364213a1327063aca852e76897c4
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild
new file mode 100644
index 000000000000..f701d3e9f5b5
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="The DICOM Toolkit"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
+SRC_URI="http://dicom.offis.de/download/dcmtk/release/${P}.tar.gz"
+
+LICENSE="OFFIS"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="doc png ssl tcpd tiff +threads xml zlib"
+
+RDEPEND="
+	dev-libs/icu:=
+	virtual/jpeg:0
+	png? ( media-libs/libpng:* )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tiff? ( media-libs/tiff:0 )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	media-gfx/graphviz
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:share/doc/dcmtk:&-${PV}:" \
+		-e "s:DIR \"/:DIR \"/usr/:" \
+		-e "s:usr/etc:etc:" \
+		-e "s:/lib\":/$(get_libdir)\":" \
+		-e "s:COPYRIGHT::" \
+		-i CMakeLists.txt || die
+	sed -e 's:${CMAKE_INSTALL_PREFIX}/::' \
+		-i dcmwlm/data/CMakeLists.txt doxygen/CMakeLists.txt || die
+	# Temporary workaround: docs are not built with CMake
+	sed -i -e '/include/d' doxygen/Makefile.in || die
+
+	# fix -D deprecation warnings
+	sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
+		"${S}"/config/configure.in \
+		"${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DDCMTK_WITH_ICU=ON
+		-DDCMTK_WITH_TIFF=$(usex tiff)
+		-DDCMTK_WITH_PNG=$(usex png)
+		-DDCMTK_WITH_XML=$(usex xml)
+		-DDCMTK_WITH_ZLIB=$(usex zlib)
+		-DDCMTK_WITH_OPENSSL=$(usex ssl)
+		-DDCMTK_WITH_DOXYGEN=$(usex doc)
+		-DDCMTK_WITH_THREADS=$(usex threads)
+	)
+
+	cmake-utils_src_configure
+
+	if use doc; then
+		cd "${S}"/doxygen || die
+		econf
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		emake -C "${S}"/doxygen
+	fi
+}
+
+src_install() {
+	doman doxygen/manpages/man1/*
+
+	if use doc; then
+		local HTML_DOCS=( "${S}"/doxygen/htmldocs/. )
+	fi
+	cmake-utils_src_install
+}