From f287ecad888abdeb38e617d0485de282cd6819db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 19 Dec 2022 19:49:08 +0000 Subject: gentoo auto-resync : 19:12:2022 - 19:49:08 --- sci-libs/dcmtk/Manifest | 4 - sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild | 87 --------------------- sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild | 89 ---------------------- .../files/dcmtk-3.6.5-rename-bundled-charls.patch | 70 ----------------- 4 files changed, 250 deletions(-) delete mode 100644 sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild delete mode 100644 sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild delete mode 100644 sci-libs/dcmtk/files/dcmtk-3.6.5-rename-bundled-charls.patch (limited to 'sci-libs/dcmtk') diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index 099fa95fc1f6..2c5d260d120a 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -1,7 +1,3 @@ -AUX dcmtk-3.6.5-rename-bundled-charls.patch 2913 BLAKE2B 246d283ccb98606faaee4ef6ad25368ee47e6c96ef44e334d774625b375788e5c1ae41ca3aa6048ff6c76b1ddaae242d3c783875fe7e9e9c740675e96d8a2495 SHA512 dce186372d22e7b5ae06d3fe623029e95b9cb40005716fc97cd7493ba4fd6c4694228d878941efd9a0f57b2424f713edbebb38ed607ed2e84b65a368f647bab6 -DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45 -EBUILD dcmtk-3.6.5-r2.ebuild 1902 BLAKE2B 74fdd79e44326bd70fa2ee1a3159b130396c080adfa6324e711d081992215703277f9f3e5ddbb47d7d164f270857c1b8a40989f48792414cb1dd845abe016b26 SHA512 1e44f0ebdc717247a59d228f52aea3954e1e031504288f8b9cdb4522b8dddaa353ebb07727bac3a173afd80326eb6b3b653039772f5a3d91c15a5cfe4042e4b0 -EBUILD dcmtk-3.6.5-r3.ebuild 1944 BLAKE2B 0812c73548ada77a1d9d575dd2d86f1751a90e0c570a84630b9ff38a8445a3b32ecf6e9275683ea62b4b632eb0fecdf6a7acf3c160be0d091cf04c0c52c289de SHA512 639a6c649b8e4ffe62678e68b7bcf165cdc3687369abff0909ed3b488678af24b89a6c64813c4e12b2763bc4cd03830eef583afaadb96af4f9d52bffbe9c2b6b EBUILD dcmtk-3.6.7-r1.ebuild 1902 BLAKE2B c15b9a8a1344169b8336025b2d74afb81f6f44cd1e7c3c5188ebd55ca2ceb728b6fe2174b5f4c0487697374bdbf470f3b2159c840de0e8fc5b05f38a3b1f3ccc SHA512 4481690bfb48d1706fc7c02e070dfa95916a09e3405745dbdf919ae324b260fb36ec6dc6aa56f7bed58e9a9a72add7cc505ef40769e74b7d97ddc18164dcd9a8 MISC metadata.xml 228 BLAKE2B aed5dcff29c27f92a26fb6756bc7ac8951564825a29dd244c02f697ddc0cc72a3171a360dc67db9d2fb3dcf51bcfe4078bb085c5ca0e343856819732a1aaa410 SHA512 34ff32136442a7884b3bacd8d838f962357f15cbbb4e172bbfe2f042e716313d5dfd29d29d38c4acab816a85803e2c94f98f1933c688cc76c2866454891257ad diff --git a/sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild deleted file mode 100644 index 224c2f037eda..000000000000 --- a/sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -SLOT="0" -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} - media-gfx/graphviz -" -BDEPEND="doc? ( app-doc/doxygen )" - -src_prepare() { - cmake_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=( - -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/dcmtk-3.6.5-r3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild deleted file mode 100644 index 806ae73f1d28..000000000000 --- a/sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -SLOT="0" -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-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${P}-rename-bundled-charls.patch" -) - -src_prepare() { - cmake_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=( - -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.5-rename-bundled-charls.patch b/sci-libs/dcmtk/files/dcmtk-3.6.5-rename-bundled-charls.patch deleted file mode 100644 index 5bb51fdc3273..000000000000 --- a/sci-libs/dcmtk/files/dcmtk-3.6.5-rename-bundled-charls.patch +++ /dev/null @@ -1,70 +0,0 @@ -Upstream: https://git.dcmtk.org/?p=dcmtk.git;a=commitdiff;h=09afb527bb889932f919c28f47b08c84fe19ab32 - -From 46b4b4c2d48612b60f27969db142599f56042a47 Mon Sep 17 00:00:00 2001 -From: Marco Eichelberg -Date: Tue, 10 Nov 2020 12:31:00 +0100 -Subject: [PATCH] Renamed libcharls to libdcmtkcharls. - -Renamed the CharLS JPEG-LS library that is built into DCMTK from -"charls" to "dcmtkcharls" to avoid a naming conflict with another -installation of the CharLS library when building shared libraries. - -Thanks to Mathieu Malaterre for the suggestion -and the patch. ---- - dcmjpls/apps/CMakeLists.txt | 2 +- - dcmjpls/libcharls/CMakeLists.txt | 4 ++-- - dcmjpls/libcharls/intrface.h | 2 +- - dcmjpls/libsrc/CMakeLists.txt | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt -index 2a9a452..0cb3f53 100644 ---- a/dcmjpls/apps/CMakeLists.txt -+++ b/dcmjpls/apps/CMakeLists.txt -@@ -8,5 +8,5 @@ endforeach() - - # make sure executables are linked to the corresponding libraries - foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm) -- DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd) -+ DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls dcmtkcharls dcmimage dcmimgle dcmdata oflog ofstd ofstd) - endforeach() -diff --git a/dcmjpls/libcharls/CMakeLists.txt b/dcmjpls/libcharls/CMakeLists.txt -index 0c5b143..ae0c017 100644 ---- a/dcmjpls/libcharls/CMakeLists.txt -+++ b/dcmjpls/libcharls/CMakeLists.txt -@@ -2,6 +2,6 @@ - include_directories("${dcmjpls_SOURCE_DIR}/libcharls" "${ofstd_SOURCE_DIR}/include") - - # create library from source files --DCMTK_ADD_LIBRARY(charls header intrface jpegls) -+DCMTK_ADD_LIBRARY(dcmtkcharls header intrface jpegls) - --DCMTK_TARGET_LINK_MODULES(charls ofstd oflog) -+DCMTK_TARGET_LINK_MODULES(dcmtkcharls ofstd oflog) -diff --git a/dcmjpls/libcharls/intrface.h b/dcmjpls/libcharls/intrface.h -index c8fdaa9..3aa27fd 100644 ---- a/dcmjpls/libcharls/intrface.h -+++ b/dcmjpls/libcharls/intrface.h -@@ -10,7 +10,7 @@ - #include "dcmtk/ofstd/ofstd.h" /* for size_t */ - #include "dcmtk/ofstd/ofdefine.h" /* for DCMTK_DECL_EXPORT */ - --#ifdef charls_EXPORTS -+#ifdef dcmtkcharls_EXPORTS - #define DCMTK_CHARLS_EXPORT DCMTK_DECL_EXPORT - #else - #define DCMTK_CHARLS_EXPORT DCMTK_DECL_IMPORT -diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt -index 314face..bd928f8 100644 ---- a/dcmjpls/libsrc/CMakeLists.txt -+++ b/dcmjpls/libsrc/CMakeLists.txt -@@ -4,4 +4,4 @@ include_directories("${dcmjpls_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include - # create library from source files - DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece) - --DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls) -+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage dcmtkcharls) --- -2.1.4 - -- cgit v1.2.3