gentoo resync : 30.06.2019

3 files changed, 37 insertions, 6 deletions

diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 706fe3d835c7..b5ed7ad53ea0 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -1,5 +1,6 @@
 AUX dcmtk-3.6.3-dcmqrdb-cfg.patch 3031 BLAKE2B 9fd21949e42c7f0c479db7d9b81c133837bec4ba68554e463d253c47b451ded6e1d74aa8d545ca10220570be48021f8640eb47f63706ad517ee0ae6c6b2fa2cf SHA512 2487f88a650e299cc6a2011ba12f74bd2c305c4d8aad57034b04f99f4c0095505f6e000cada9fcafe466590719c0678735cafec0254d473c48e171c3adc91d9a
+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
-EBUILD dcmtk-3.6.3.ebuild 2001 BLAKE2B 86e238bd4e5c4c407b586d00ba35647b76a90d115627950449a34da2b6ba22b2731317763c52fd5297a2f9cb7bfbd875aa2578620e938d9bed4a821f0458d666 SHA512 a2ffe250b409318886005a092c349dc510d754c46629fa23cfbdef1ab423876e43141c721784a6d19e3ddbbfdd829398731c88a4684c2a549fddd36dcf4d5ff1
+EBUILD dcmtk-3.6.3.ebuild 2039 BLAKE2B 655b3b3d424ebdba0d96f629b2308d1bd5650c03ebf48e575f05a8a9c3295928aff91cf34086b1a2f19a41907ff4811394f6c4622f3fd0ba3b2501dbe5a44d2c SHA512 7b92fda743f4ad39112f440b63db6549547a0e12510b9feb2c2a04cbea1a96db49d3c4ee04a8bf4e61bf500c0a94325332a997cc1f5f2434040b1b6a59b24211
 MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68
diff --git a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
index 463fca72dfb1..4990be778c72 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 )"
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-dcmqrdb-cfg.patch
 	"${FILESDIR}"/${P}-nostrip.patch
+	"${FILESDIR}"/${P}-fix-gcc9.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch b/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch
new file mode 100644
index 000000000000..596a1ae21b95
--- /dev/null
+++ b/sci-libs/dcmtk/files/dcmtk-3.6.3-fix-gcc9.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/686592
+
+In file included from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/variant.h:19,
+                 from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/ofvriant.h:379,
+                 from /var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/tests/tvariant.cc:26:
+/var/tmp/portage/sci-libs/dcmtk-3.6.3/work/dcmtk-3.6.3/ofstd/include/dcmtk/ofstd/variadic/helpers.h:57:32: error: narrowing conversion of ‘-1’ from ‘int’ to ‘long unsigned int’ [-Wnarrowing]
+   57 | : OFintegral_constant<size_t,-1> {};
+      |
+
+--- a/ofstd/include/dcmtk/ofstd/variadic/helpers.h
++++ b/ofstd/include/dcmtk/ofstd/variadic/helpers.h
+@@ -14,6 +14,8 @@
+ #ifndef VARIADIC_HELPERS_H
+ #define VARIADIC_HELPERS_H
+ 
++#include <limits>
++
+ #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
+ 
+ #include "dcmtk/ofstd/oftraits.h"
+@@ -54,7 +56,7 @@
+ 
+ template<size_t Index,typename T>
+ struct OFvariadic_find_type_t<Index,T>
+-: OFintegral_constant<size_t,-1> {};
++: OFintegral_constant<size_t,std::numeric_limits<size_t>::max()> {};
+ 
+ template<typename T,typename T0=OFvariadic_nil,typename T1=OFvariadic_nil,typename T2=OFvariadic_nil,typename T3=OFvariadic_nil,typename T4=OFvariadic_nil,typename T5=OFvariadic_nil,typename T6=OFvariadic_nil,typename T7=OFvariadic_nil,typename T8=OFvariadic_nil,typename T9=OFvariadic_nil,typename T10=OFvariadic_nil,typename T11=OFvariadic_nil,typename T12=OFvariadic_nil,typename T13=OFvariadic_nil,typename T14=OFvariadic_nil,typename T15=OFvariadic_nil,typename T16=OFvariadic_nil,typename T17=OFvariadic_nil,typename T18=OFvariadic_nil,typename T19=OFvariadic_nil,typename T20=OFvariadic_nil,typename T21=OFvariadic_nil,typename T22=OFvariadic_nil,typename T23=OFvariadic_nil,typename T24=OFvariadic_nil,typename T25=OFvariadic_nil,typename T26=OFvariadic_nil,typename T27=OFvariadic_nil,typename T28=OFvariadic_nil,typename T29=OFvariadic_nil,typename T30=OFvariadic_nil,typename T31=OFvariadic_nil,typename T32=OFvariadic_nil,typename T33=OFvariadic_nil,typename T34=OFvariadic_nil,typename T35=OFvariadic_nil,typename T36=OFvariadic_nil,typename T37=OFvariadic_nil,typename T38=OFvariadic_nil,typename T39=OFvariadic_nil,typename T40=OFvariadic_nil,typename T41=OFvariadic_nil,typename T42=OFvariadic_nil,typename T43=OFvariadic_nil,typename T44=OFvariadic_nil,typename T45=OFvariadic_nil,typename T46=OFvariadic_nil,typename T47=OFvariadic_nil,typename T48=OFvariadic_nil,typename T49=OFvariadic_nil>
+ struct OFvariadic_find_type