* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2017-10-16 3:34 David Seifert
0 siblings, 0 replies; 24+ messages in thread
From: David Seifert @ 2017-10-16 3:34 UTC (permalink / raw
To: gentoo-commits
commit: db1811428cb7cfe2a41546c5f3bcaacd45922027
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 02:58:15 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 02:58:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db181142
sci-libs/dcmtk: [QA] Add cmake-utils_src_prepare
Package-Manager: Portage-2.3.11, Repoman-2.3.3
sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index afc167d9d7e..986977e0200 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -26,17 +26,19 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
media-gfx/graphviz"
-src_prepare() {
+PATCHES=(
+ "${FILESDIR}"/01_fix_perl_script_path.patch
+ "${FILESDIR}"/02_dcmtk_3.6.0-1.patch
+ "${FILESDIR}"/04_nostrip.patch
+ "${FILESDIR}"/dcmtk_version_number.patch
+ "${FILESDIR}"/png_tiff.patch
+ "${FILESDIR}"/regression_stacksequenceisodd.patch
+ "${FILESDIR}"/${PN}-asneeded.patch
+ "${FILESDIR}"/${PN}-gcc472-error.patch
+)
- epatch \
- "${FILESDIR}"/01_fix_perl_script_path.patch \
- "${FILESDIR}"/02_dcmtk_3.6.0-1.patch \
- "${FILESDIR}"/04_nostrip.patch \
- "${FILESDIR}"/dcmtk_version_number.patch \
- "${FILESDIR}"/png_tiff.patch \
- "${FILESDIR}"/regression_stacksequenceisodd.patch \
- "${FILESDIR}"/${PN}-asneeded.patch \
- "${FILESDIR}"/${PN}-gcc472-error.patch
+src_prepare() {
+ cmake-utils_src_prepare
sed -e "s:share/doc/dcmtk:&-${PV}:" \
-e "s:DIR \"/:DIR \"/usr/:" \
@@ -56,7 +58,7 @@ src_prepare() {
}
src_configure() {
- mycmakeargs="${mycmakeargs}
+ local mycmakeargs="${mycmakeargs}
-DBUILD_SHARED_LIBS=ON
-DCMAKE_INSTALL_PREFIX=/
$(cmake-utils_use tiff DCMTK_WITH_TIFF)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2018-05-21 17:05 Aaron Bauman
0 siblings, 0 replies; 24+ messages in thread
From: Aaron Bauman @ 2018-05-21 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 7d439a5d8fcaec6aab7f5ca446a6c4f910bcc7f3
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon May 21 10:19:06 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon May 21 17:02:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d439a5d
sci-libs/dcmtk: use HTTPs
sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index 2b6faacbba6..414724b2e23 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -6,7 +6,7 @@ EAPI="5"
inherit cmake-utils eutils
DESCRIPTION="The DICOM Toolkit"
-HOMEPAGE="http://dicom.offis.de/dcmtk.php.en"
+HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
SRC_URI="ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/${P}.tar.gz"
LICENSE="OFFIS"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2018-08-26 18:24 Andreas Sturmlechner
0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2018-08-26 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 3e34941e0fb1110f3aabefd994630b7702c35f2e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 15:59:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 18:23:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e34941e
sci-libs/dcmtk: Put || die where || die belongs
Package-Manager: Portage-2.3.48, Repoman-2.3.10
sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index 414724b2e23..1a94d20b506 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
# fix -D deprecation warnings
sed -i -e "s|_BSD_SOURCE|_DEFAULT_SOURCE|g" \
"${S}"/config/configure.in \
- "${S}"/CMakeLists.txt
+ "${S}"/CMakeLists.txt || die
}
src_configure() {
@@ -74,7 +74,7 @@ src_configure() {
cmake-utils_src_configure
if use doc; then
- cd "${S}"/doxygen
+ cd "${S}"/doxygen || die
econf
fi
}
@@ -83,16 +83,16 @@ src_compile() {
cmake-utils_src_compile
if use doc; then
- emake -C "${S}"/doxygen || die
+ emake -C "${S}"/doxygen
fi
}
src_install() {
cmake-utils_src_install
- doman doxygen/manpages/man1/* || die
+ doman doxygen/manpages/man1/*
if use doc; then
- dohtml -r "${S}"/doxygen/htmldocs/* || die
+ dohtml -r "${S}"/doxygen/htmldocs/*
fi
}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2019-06-22 13:16 David Seifert
0 siblings, 0 replies; 24+ messages in thread
From: David Seifert @ 2019-06-22 13:16 UTC (permalink / raw
To: gentoo-commits
commit: e3b133aaa759ad1e634313f1db5efd31459ebe9d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 13:16:25 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 13:16:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b133aa
sci-libs/dcmtk: [QA] Fix missing slot dep operators
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.3.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
index b1f261640f6..4990be778c7 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
@@ -17,12 +17,12 @@ IUSE="doc png ssl tcpd tiff +threads xml zlib"
RDEPEND="
dev-libs/icu:=
virtual/jpeg:0
- png? ( media-libs/libpng:* )
+ png? ( media-libs/libpng:0= )
ssl? ( dev-libs/openssl:0= )
tcpd? ( sys-apps/tcp-wrappers )
- tiff? ( media-libs/tiff:0 )
- xml? ( dev-libs/libxml2:2 )
- zlib? ( sys-libs/zlib )"
+ tiff? ( media-libs/tiff:0= )
+ xml? ( dev-libs/libxml2:2= )
+ zlib? ( sys-libs/zlib:0= )"
DEPEND="${RDEPEND}
media-gfx/graphviz
doc? ( app-doc/doxygen )"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2019-08-08 3:15 Joonas Niilola
0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2019-08-08 3:15 UTC (permalink / raw
To: gentoo-commits
commit: 1c0a96eebf56ee5850e74d3eddde572eb7df6557
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Thu May 16 21:20:20 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 03:14:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0a96ee
sci-libs/dcmtk: version bump 3.6.4
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/12024
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/dcmtk/Manifest | 1 +
sci-libs/dcmtk/dcmtk-3.6.4.ebuild | 86 +++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index fd3e552a864..85301030809 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1 +1,2 @@
DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
+DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 2d362789e7819089b7da46a9601fa5d53b8e8aab1ac7d30bf1180b3da0645d015a177c97188dc9255c6962a9d7246cf287b20824a78fbe9612b9bc277e68d294 SHA512 735f85d04410437a5163b154f43c8a299aff7a8f810605ce6c5027ae4569ff1323a69f70a2603805cec9d826a31166fd904bb53c3edc1137bfc41ba2902c2261
diff --git a/sci-libs/dcmtk/dcmtk-3.6.4.ebuild b/sci-libs/dcmtk/dcmtk-3.6.4.ebuild
new file mode 100644
index 00000000000..4678a05c1f3
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.4.ebuild
@@ -0,0 +1,86 @@
+# 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
+ -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
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2019-08-09 16:19 Joonas Niilola
0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2019-08-09 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 3494cfeb45b8fefd8a39d3ffdbde30a5423a3740
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Fri Aug 9 14:35:48 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 16:18:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3494cfeb
sci-libs/dcmtk: FHS-compliant config file paths
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/12656
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.4-r1.ebuild | 87 ++++++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
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 00000000000..f701d3e9f5b
--- /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
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2019-08-09 16:19 Joonas Niilola
0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2019-08-09 16:19 UTC (permalink / raw
To: gentoo-commits
commit: caa04314e2b31656f9c13c5e40c9387c0309d25e
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 16:19:25 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 16:19:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa04314
sci-libs/dcmtk: remove old 3.6.4
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.4.ebuild | 86 ---------------------------------------
1 file changed, 86 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.4.ebuild b/sci-libs/dcmtk/dcmtk-3.6.4.ebuild
deleted file mode 100644
index 4678a05c1f3..00000000000
--- a/sci-libs/dcmtk/dcmtk-3.6.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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
- -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
-}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2020-01-05 10:10 Joonas Niilola
0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2020-01-05 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 2663d018168059a7843fe516405f77a52742b200
Author: Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Sun Dec 8 01:10:32 2019 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 10:09:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2663d018
sci-libs/dcmtk: version bump 3.6.5 and prefix fix
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Horea Christian <chr <AT> chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/13913
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-libs/dcmtk/Manifest | 1 +
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 89 +++++++++++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 85301030809..9501743cada 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,2 +1,3 @@
DIST dcmtk-3.6.3.tar.gz 6269785 BLAKE2B 8f0797840fa5ab4ffb60e46f65b16739d3ed0cb7591b20cbfba81a59de97344a663f73bed8fc7f349a99accc46fd2fde3cff021861bde6f07957a433a4db67a3 SHA512 5b907422d2d80e417ae8239e159d1300da4ed8db7e92cee619cc1d37116165e8824f8a9103605e07a95b1bffe94bbd2d5e05125f068281d241e8e78755d0b5e8
DIST dcmtk-3.6.4.tar.gz 6402734 BLAKE2B 2d362789e7819089b7da46a9601fa5d53b8e8aab1ac7d30bf1180b3da0645d015a177c97188dc9255c6962a9d7246cf287b20824a78fbe9612b9bc277e68d294 SHA512 735f85d04410437a5163b154f43c8a299aff7a8f810605ce6c5027ae4569ff1323a69f70a2603805cec9d826a31166fd904bb53c3edc1137bfc41ba2902c2261
+DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
new file mode 100644
index 00000000000..62dcaa4d598
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 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="https://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
+"
+BDEPEND="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="${EROOT}/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
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2020-10-15 15:58 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2020-10-15 15:58 UTC (permalink / raw
To: gentoo-commits
commit: abd6e77ee9111c2667961f18b6120e404adcd546
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 15:58:00 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 15:58:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abd6e77e
sci-libs/dcmtk: ppc64 keyworded (bug #745783)
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 240ca02f96f..ce2042496c1 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -10,7 +10,7 @@ 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 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2020-11-12 0:35 Thomas Deutschmann
0 siblings, 0 replies; 24+ messages in thread
From: Thomas Deutschmann @ 2020-11-12 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 89eea3c87f75619134727cd7bfe67c832fe5c28f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 00:30:40 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 00:35:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89eea3c8
sci-libs/dcmtk: x86 stable (bug #753566)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index ce2042496c1..cee3ed3c36d 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -10,7 +10,7 @@ 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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2020-11-12 16:26 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2020-11-12 16:26 UTC (permalink / raw
To: gentoo-commits
commit: d5b6071e32074907f24cdf3715b13d54a760323f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:26:19 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:26:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b6071e
sci-libs/dcmtk: Stabilize 3.6.5 amd64, #753566
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index cee3ed3c36d..58d21bcacae 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -10,7 +10,7 @@ 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 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2020-12-21 18:07 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2020-12-21 18:07 UTC (permalink / raw
To: gentoo-commits
commit: da42ffbe90be1ba9db60cb7d3eaa34532765e544
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 18:05:36 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 18:05:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da42ffbe
sci-libs/dcmtk: Keyword 3.6.5 arm64, #758152
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 58d21bcacae..17f4eb3f34d 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -10,7 +10,7 @@ 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 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2021-06-11 0:29 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-06-11 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 301e905e7275a55680753fd1be85d57baca9b16b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 00:24:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 00:29:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301e905e
sci-libs/dcmtk: fix VariableScope (EROOT)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 17f4eb3f34d..3a0f52103c4 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -51,7 +51,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DCMAKE_INSTALL_SYSCONFDIR="${EROOT}/etc"
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DDCMTK_WITH_ICU=ON
-DDCMTK_WITH_TIFF=$(usex tiff)
-DDCMTK_WITH_PNG=$(usex png)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-02-28 7:06 Yixun Lan
0 siblings, 0 replies; 24+ messages in thread
From: Yixun Lan @ 2022-02-28 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 127bf4d7986d94953b8c3b6d0ffdc92f53810325
Author: Alex Fan <alex.fan.q <AT> gmail <DOT> com>
AuthorDate: Mon Feb 28 01:43:56 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 07:02:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127bf4d7
sci-libs/dcmtk: keyword 3.6.5 for ~riscv
Signed-off-by: Alex Fan <alex.fan.q <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index 3a0f52103c40..d611928362a6 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ 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 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-06-21 9:57 Andrew Ammerlaan
0 siblings, 0 replies; 24+ messages in thread
From: Andrew Ammerlaan @ 2022-06-21 9:57 UTC (permalink / raw
To: gentoo-commits
commit: d0d1638db229dba6771f777146aa303480c96a93
Author: François-Xavier Carton <fx.carton91 <AT> gmail <DOT> com>
AuthorDate: Tue May 17 08:17:33 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 09:57:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d1638d
sci-libs/dcmtk: remove unnecessary dep on libjpeg
IJG's libjpeg is bundled and used internally, libjpeg-turbo is not used.
Signed-off-by: François-Xavier Carton <fx.carton91 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25533
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild | 1 -
sci-libs/dcmtk/dcmtk-3.6.5.ebuild | 1 -
sci-libs/dcmtk/dcmtk-3.6.7.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
index d151996f1e2e..b635fd5468e2 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
@@ -16,7 +16,6 @@ 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 )
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
index d611928362a6..44b08cfa35d0 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
@@ -16,7 +16,6 @@ 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 )
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
index 34656b3a4676..65ae6a321c7d 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
@@ -16,7 +16,6 @@ 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 )
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-06-21 9:57 Andrew Ammerlaan
0 siblings, 0 replies; 24+ messages in thread
From: Andrew Ammerlaan @ 2022-06-21 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 979b3a03db71a3053de19fdcceb68665c3ccccf1
Author: François-Xavier Carton <fx.carton91 <AT> gmail <DOT> com>
AuthorDate: Tue May 17 07:49:38 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 09:57:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979b3a03
sci-libs/dcmtk: bump to 3.6.7
Closes: https://bugs.gentoo.org/832453
Signed-off-by: François-Xavier Carton <fx.carton91 <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/dcmtk/Manifest | 1 +
sci-libs/dcmtk/dcmtk-3.6.7.ebuild | 86 +++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 6b90d4478b44..4d0e465ad87f 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1 +1,2 @@
DIST dcmtk-3.6.5.tar.gz 6483626 BLAKE2B 6182ef207b42b16ee91e94397cc8a5b2d108435a30d4c86f0b7e39af91186604f16be07a75e176bf50575446abcab21b2f63158dc4e5f2cb6de3996a0881b295 SHA512 c0cf61b0095c5708709406bfef5e8bb82dd01dbf77df7f2af2118004920bda68218eb1e4174bf92941cdae0acdb275c886570dafd29476eee2eb815e9a82830a
+DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
new file mode 100644
index 000000000000..34656b3a4676
--- /dev/null
+++ b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
@@ -0,0 +1,86 @@
+# 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:=
+ 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}"
+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
+}
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-06-21 11:01 Andrew Ammerlaan
0 siblings, 0 replies; 24+ messages in thread
From: Andrew Ammerlaan @ 2022-06-21 11:01 UTC (permalink / raw
To: gentoo-commits
commit: f85b291a4801cfed19239e16439bbc20b4edc514
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:00:55 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:00:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85b291a
sci-libs/dcmtk: add missing doc building dependency
Closes: https://bugs.gentoo.org/853295
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.7.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
index 65ae6a321c7d..64387ea2536d 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
@@ -24,7 +24,10 @@ RDEPEND="
zlib? ( sys-libs/zlib )
"
DEPEND="${RDEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="doc? (
+ app-doc/doxygen
+ virtual/latex-base
+)"
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-12-16 1:40 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-16 1:40 UTC (permalink / raw
To: gentoo-commits
commit: 426db63fb6f16b7702fb6620c73d0ac2c0191e81
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 01:31:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 01:38:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426db63f
sci-libs/dcmtk: add media-libs/libtiff subslot dep
libtiff changed SONAME.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild | 4 ++--
sci-libs/dcmtk/{dcmtk-3.6.5.ebuild => dcmtk-3.6.5-r2.ebuild} | 4 ++--
sci-libs/dcmtk/{dcmtk-3.6.7.ebuild => dcmtk-3.6.7-r1.ebuild} | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
index b635fd5468e2..806ae73f1d28 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
@@ -17,9 +17,9 @@ IUSE="doc png ssl tcpd tiff +threads xml zlib"
RDEPEND="
dev-libs/icu:=
png? ( media-libs/libpng:* )
- ssl? ( dev-libs/openssl:0= )
+ ssl? ( dev-libs/openssl:= )
tcpd? ( sys-apps/tcp-wrappers )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:= )
xml? ( dev-libs/libxml2:2 )
zlib? ( sys-libs/zlib )
"
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild
similarity index 96%
rename from sci-libs/dcmtk/dcmtk-3.6.5.ebuild
rename to sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild
index 44b08cfa35d0..224c2f037eda 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.5.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.5-r2.ebuild
@@ -17,9 +17,9 @@ IUSE="doc png ssl tcpd tiff +threads xml zlib"
RDEPEND="
dev-libs/icu:=
png? ( media-libs/libpng:* )
- ssl? ( dev-libs/openssl:0= )
+ ssl? ( dev-libs/openssl:= )
tcpd? ( sys-apps/tcp-wrappers )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:= )
xml? ( dev-libs/libxml2:2 )
zlib? ( sys-libs/zlib )
"
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
similarity index 96%
rename from sci-libs/dcmtk/dcmtk-3.6.7.ebuild
rename to sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
index 64387ea2536d..30f53ff05704 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
@@ -17,9 +17,9 @@ IUSE="doc png ssl tcpd tiff +threads xml zlib"
RDEPEND="
dev-libs/icu:=
png? ( media-libs/libpng:* )
- ssl? ( dev-libs/openssl:0= )
+ ssl? ( dev-libs/openssl:= )
tcpd? ( sys-apps/tcp-wrappers )
- tiff? ( media-libs/tiff:0 )
+ tiff? ( media-libs/tiff:= )
xml? ( dev-libs/libxml2:2 )
zlib? ( sys-libs/zlib )
"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-12-18 7:46 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-18 7:46 UTC (permalink / raw
To: gentoo-commits
commit: 53debab940ebf430606209c95cbd32b94897ce6d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 07:43:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 07:46:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53debab9
sci-libs/dcmtk: fix revbump order
Sorry for the noise. The script didn't get ordering right
in all cases.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/{dcmtk-3.6.5-r1.ebuild => dcmtk-3.6.5-r3.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild
similarity index 100%
rename from sci-libs/dcmtk/dcmtk-3.6.5-r1.ebuild
rename to sci-libs/dcmtk/dcmtk-3.6.5-r3.ebuild
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-12-18 8:01 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-18 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 458c44cbd34e838814cbc524753c1058cbac2c79
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 08:01:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 08:01:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458c44cb
sci-libs/dcmtk: Stabilize 3.6.7-r1 amd64, #886553
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
index 30f53ff05704..8ee9a4061596 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2022-12-18 8:06 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2022-12-18 8:06 UTC (permalink / raw
To: gentoo-commits
commit: 52bb65b248fb09945f5571d4125f8647042f0f5a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 08:06:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 08:06:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52bb65b2
sci-libs/dcmtk: Stabilize 3.6.7-r1 x86, #886553
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
index 8ee9a4061596..4a85f26eadb1 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
SLOT="0"
IUSE="doc png ssl tcpd tiff +threads xml zlib"
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2024-03-04 0:02 Andreas K. Hüttel
0 siblings, 0 replies; 24+ messages in thread
From: Andreas K. Hüttel @ 2024-03-04 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 95a575a2bd2d6b396d56e01776135f15c56c2104
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 00:01:50 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 00:02:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a575a2
sci-libs/dcmtk: Apply musl-1.2.4 largefile workaround
Bug: https://bugs.gentoo.org/908398
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
index 5cc0d99ccf7f..9a82a24e3064 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.7-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit flag-o-matic cmake
DESCRIPTION="The DICOM Toolkit"
HOMEPAGE="https://dicom.offis.de/dcmtk.php.en"
@@ -50,6 +50,9 @@ src_prepare() {
}
src_configure() {
+ # bug 908398
+ use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
local mycmakeargs=(
-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-DDCMTK_WITH_ICU=ON
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2024-03-11 16:55 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-03-11 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 8eedd7217ddbe705e4cace5413632a5d53c2361f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 15:24:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 16:55:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eedd721
sci-libs/dcmtk: add github upstream metadata
It's an official mirror.
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
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 @@
<maintainer type="project">
<email>sci-biology@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="github">DCMTK/dcmtk</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
@ 2024-04-01 5:30 Sam James
0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-04-01 5:30 UTC (permalink / raw
To: gentoo-commits
commit: 1df72e06c83c784bf07e39536681faa6a6c71db8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 05:04:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 05:29:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df72e06
sci-libs/dcmtk: update LTO comment (fixed upstream in git!)
Thank you dcmtk maintainers :)
Bug: https://bugs.gentoo.org/862699
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-libs/dcmtk/dcmtk-3.6.8.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild
index 1a375189d12c..ed291a83e208 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild
@@ -50,8 +50,7 @@ src_prepare() {
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.
+ # master seems fixed, so >3.6.8 should be able to drop this.
filter-lto
# bug 908398
^ permalink raw reply related [flat|nested] 24+ messages in thread
end of thread, other threads:[~2024-04-01 5:30 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-21 18:07 [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-01 5:30 Sam James
2024-03-11 16:55 Sam James
2024-03-04 0:02 Andreas K. Hüttel
2022-12-18 8:06 Sam James
2022-12-18 8:01 Sam James
2022-12-18 7:46 Sam James
2022-12-16 1:40 Sam James
2022-06-21 11:01 Andrew Ammerlaan
2022-06-21 9:57 Andrew Ammerlaan
2022-06-21 9:57 Andrew Ammerlaan
2022-02-28 7:06 Yixun Lan
2021-06-11 0:29 Sam James
2020-11-12 16:26 Sam James
2020-11-12 0:35 Thomas Deutschmann
2020-10-15 15:58 Sam James
2020-01-05 10:10 Joonas Niilola
2019-08-09 16:19 Joonas Niilola
2019-08-09 16:19 Joonas Niilola
2019-08-08 3:15 Joonas Niilola
2019-06-22 13:16 David Seifert
2018-08-26 18:24 Andreas Sturmlechner
2018-05-21 17:05 Aaron Bauman
2017-10-16 3:34 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox