From 72d7e048ae88be323a380e2eae52dfda0b2dc1c0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Mar 2024 18:45:56 +0000 Subject: gentoo auto-resync : 11:03:2024 - 18:45:56 --- sci-libs/Manifest.gz | Bin 45115 -> 45115 bytes sci-libs/dcmtk/Manifest | 5 +- sci-libs/dcmtk/dcmtk-3.6.8.ebuild | 95 ++++++++++++++++++++++++++ sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch | 12 ++++ sci-libs/dcmtk/metadata.xml | 3 + 5 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 sci-libs/dcmtk/dcmtk-3.6.8.ebuild create mode 100644 sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 437b817a7ffd..cd6af83e827d 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index dad96e9c4133..1b87d5e2f843 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -1,3 +1,6 @@ +AUX dcmtk-3.6.8-docdir.patch 754 BLAKE2B 3e2ee8a6a213015b14489f63ef002c8d2568e2c992c55a21f66387c962541be271e8e925c0d0924b2d25b72d8b878731ce64741cab5fa0dcdb21d9da8fd02d8a SHA512 addbbb9e2b12cc296ae68e3dd9103f9d473e0f61e96934dc078ad13ba60b8f92e9b8459b71d8df39b2e0c28f3283f66e31581fb8a124cc8f35f99e1c4afb1dfa DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45 +DIST dcmtk-3.6.8.tar.gz 9628364 BLAKE2B 367885c3fda65b7b2e42555ba648800f9585cbd4c4d94e01f737110fc726ce3396df50ccd6f2c9bacc59284fc1381683b72506a3c566f795c8157da39a95fb2a SHA512 1bb2aad1aa63e0a1b79d92d7c932a969deccde03fdb484dbd44198effb58d50de44a2b0cda150ce7df63e4e986af5bc1f694c8a7988b4c049c578d83ba81184a EBUILD dcmtk-3.6.7-r1.ebuild 1989 BLAKE2B 47958171848d55e4e648abec64258fe3c6547f6c18daf6dc3f46e6e5e0c88afb3787d86dab6bda6c53ae13909cf1f7fd8fe956e1b4f1653a068fc6b3f06d5898 SHA512 902b2bd3dabfce90711f811eb0eafb14f3d61f9ff545046c3b223eda15aeb2985c6c7dfcd765014b179e4b177e5ca61a37561bbf5b19201fe19614ec8e7c4780 -MISC metadata.xml 228 BLAKE2B aed5dcff29c27f92a26fb6756bc7ac8951564825a29dd244c02f697ddc0cc72a3171a360dc67db9d2fb3dcf51bcfe4078bb085c5ca0e343856819732a1aaa410 SHA512 34ff32136442a7884b3bacd8d838f962357f15cbbb4e172bbfe2f042e716313d5dfd29d29d38c4acab816a85803e2c94f98f1933c688cc76c2866454891257ad +EBUILD dcmtk-3.6.8.ebuild 2004 BLAKE2B 7d226a6ba81ea98755cc6b4a281c7cade4700c94870d5cb2efef7e67073ac322da36e47e8628b9faa8143527a177e1f6c1f6b984a62d7a88e8a7a447660ff59f SHA512 8fe802b712cec990014c6cb462df40a1d09c563df4cefbc23496277968996e33af8b4711fb51dd26b29c36aae9aeadec1fddf91ea4f0117f426b594d4b59e421 +MISC metadata.xml 308 BLAKE2B 394345b977e2dd7598cd2acdf2af966f2efecef502a4f460e4fe323c095e3de8523c4217873d18f68198996e4ee08580f46543bf7e357a227f66dcd558191615 SHA512 b8117feeab19b0128c2378d36370e907338873a177c5d8f1cfaef79bf16e877fc455cc5096bccadb99a7238c02fd01c02ae9018a81aab013e0d1a1ccc4cd650c diff --git a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild new file mode 100644 index 000000000000..1a375189d12c --- /dev/null +++ b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic cmake + +DESCRIPTION="The DICOM Toolkit" +HOMEPAGE="https://dicom.offis.de/dcmtk.php.en" +SRC_URI="https://dicom.offis.de/download/dcmtk/release/${P}.tar.gz" + +LICENSE="OFFIS" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc png ssl tcpd tiff +threads xml zlib" + +RDEPEND=" + dev-libs/icu:= + png? ( media-libs/libpng:* ) + ssl? ( dev-libs/openssl:= ) + tcpd? ( sys-apps/tcp-wrappers ) + tiff? ( media-libs/tiff:= ) + xml? ( dev-libs/libxml2:2 ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/doxygen + virtual/latex-base + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6.8-docdir.patch +) + +src_prepare() { + cmake_src_prepare + + sed -i -e "s:COPYRIGHT::" 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() { + # ODR violations (bug #862699). Reported upstream by email on 2024-03-11. + # master (>3.6.8) seems to have that original issue fixed but has another + # JPEG-related violation. + filter-lto + + # bug 908398 + use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE + + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/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_src_configure + + if use doc; then + cd "${S}"/doxygen || die + econf + fi +} + +src_compile() { + cmake_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_src_install +} diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch b/sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch new file mode 100644 index 000000000000..291571d0ce37 --- /dev/null +++ b/sci-libs/dcmtk/files/dcmtk-3.6.8-docdir.patch @@ -0,0 +1,12 @@ +--- a/CMake/GenerateDCMTKConfigure.cmake ++++ b/CMake/GenerateDCMTKConfigure.cmake +@@ -202,9 +202,6 @@ else() + + # Modify the installation paths for configuration files, data files and documents + # by adding a subdirectory with the DCMTK name and version number +- set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}") +- set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}") + + # These variables are defined as macros in osconfig.h and must end with a path separator + set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/") diff --git a/sci-libs/dcmtk/metadata.xml b/sci-libs/dcmtk/metadata.xml index de52092e6f7b..19b26d43007c 100644 --- a/sci-libs/dcmtk/metadata.xml +++ b/sci-libs/dcmtk/metadata.xml @@ -4,4 +4,7 @@ sci-biology@gentoo.org + + DCMTK/dcmtk + -- cgit v1.2.3