gentoo resync : 10.11.2019

3 files changed, 20 insertions, 17 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 5ded17ade790..0af7bcebc39d 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -3,7 +3,7 @@ AUX openscenegraph-3.5.5-cmake.patch 11029 BLAKE2B 924c464b46b58e97efc3d477742c5
 AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107bd429564248fd72c6f4d70c1622b2933273e02f294d5fd3b2529fdbbdef65cdba41db7b441b7334b6180995896b52f8212 SHA512 2905fa5031641f2d3a8cec46c32c1cbf8adfb34b7c460c22eaecca66f5cc0b73c2bda4ed68dca3bda12a5f49385c2257bd5b4f3271b13eb979298eeaefb45789
 AUX openscenegraph-3.6.3-docdir.patch 2991 BLAKE2B 9d2d3bab0d8956f66b4b23a112dbd42cbf6dc60b8f423d71f1082700d19a04867232597fadd14a60c77a0add9e60b5ffb4a0db6811dd26d854afb04d208cf716 SHA512 fd1294e441007b488186dbd944c82d1f960f7a898bcc093d0a5edfb936c727f18ad289be8dec8cfa4fbba80965bb7992b6d3a4e2c0f690a7736c05cda49a2bea
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
-DIST OpenSceneGraph-3.6.3.tar.gz 5784660 BLAKE2B b117a10d7be8fa456d739eb04f218cf9565ea4bd5a91642ada3bde5cc194a71809482ca2e6f2b4ff977fd26f3a855e27392ac60921e4217b72ebd828efa4df0e SHA512 5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322
+DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19
 EBUILD openscenegraph-3.5.5.ebuild 3735 BLAKE2B c5c689c98f6246042225f7b85e4695d0d610b65ea86def9500a1ccaa9f5bef419d33cc653d3553ff9149da58a625e2d9d179397303ff6cf0b0c0af0299f900fc SHA512 8b49334b93e1ad3033ffbec3a486705492d2275b266fd942a591b0709d854d24b5cfe65c56a1f3f47d6ddd3d308d646b126e46a4e80a60c7cc44f33b538d21c0
-EBUILD openscenegraph-3.6.3.ebuild 4332 BLAKE2B 5079b814dd8a48ff7200bc5c13b2fde78bdc002ac84e3ff06a858354df846aef29c94c3a97acba3699b42ad3151e0e0932fd289bc08a050a5b31f17380fd67ef SHA512 7b4ade8fc4403b491a8c784003874128119a78676a5102534575e3d7d772589243dd3b3e88a6e87b5a99fff0674dc9a14c07f480ce8b043e0772460d2b048af8
-MISC metadata.xml 1661 BLAKE2B 6846485027ea4fb4ba5994c4003d09f0f3929217f4f7140853776db0afe52988075bda496e29148a878ef941fe76decf2f480a8df7e87c50a8015e86b2e27e83 SHA512 e6e1f87c7322bd16929804e403f62204575a1bc6aa68e2aa22e802282ca4d547a0d30425bcf9b4caec2a618c30b2f1635f5a6c3fc816ed12f607d82b0f383789
+EBUILD openscenegraph-3.6.4.ebuild 4367 BLAKE2B 1930c78b3acd013db72e0da9aaac68bb3cfbab3d22e61e3d8cebdadf0418272164239aaca4a9b8b0c2116966f8d63239360b18798f0d5d79a6297b03b7b3c7d4 SHA512 0eb995ab288bb43232abe95bc36423cb89bcf7292bb2b6c07a4a5aae279270602fd95556e58e1e4046d158ec6c929ad2aa5160861a299c6da567d987db8905f3
+MISC metadata.xml 1759 BLAKE2B 6cdfd94a0888ac7716c282b7a473fdc23b00542bf55fe0b7b271d81dac36e1dbe6ef6923a3f6a48d6730b27fccbe6a197ebdce0c3611d736cd6674aec9ae35a8 SHA512 48f68b29d2d8ab7aeb31bdd7322ba39f1c5f9c4c14a301c828c084a774e80a818e2366bbaf2728d1a32a9d20b62bda2a45ab49a331c160d4359c1175787a9999
diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 119bb5e34052..fca914ad5596 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -14,6 +14,7 @@
 	</longdescription>
 	<use>
 		<flag name="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</flag>
+		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
 		<flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
index 995535e2ff3c..1f0f59ca8e4f 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="OpenSceneGraph"
 MY_P=${MY_PN}-${PV}
@@ -15,13 +15,18 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
 LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="asio curl debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
-las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
-truetype vnc wxwidgets xrandr zlib"
+IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
+gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2
+svg tiff truetype vnc wxwidgets xrandr +zlib"
 
-REQUIRED_USE="sdl2? ( sdl )"
+REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
 
-# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer, DCMTK
+# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	media-libs/mesa[egl?]
 	virtual/glu
@@ -42,7 +47,7 @@ RDEPEND="
 		libav? ( media-video/libav:0= )
 		!libav? ( media-video/ffmpeg:0= )
 	)
-	gdal? ( sci-libs/gdal )
+	gdal? ( sci-libs/gdal:= )
 	gif? ( media-libs/giflib:= )
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -70,17 +75,14 @@ RDEPEND="
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
 	x11-base/xorg-proto
-	doc? ( app-doc/doxygen )
 "
 
 S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
 )
 
 src_configure() {
@@ -95,7 +97,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DDYNAMIC_OPENSCENEGRAPH=ON
 		-DLIB_POSTFIX=${libdir/lib}
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" # drop after EAPI-7 port
 		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
 		-DOSG_ENVVAR_SUPPORTED=ON
 		-DOSG_PROVIDE_READFILE=ON
@@ -103,7 +104,7 @@ src_configure() {
 		$(cmake-utils_use_find_package asio Asio)
 		$(cmake-utils_use_find_package curl CURL)
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake-utils_use_find_package dicom DCMTK)
 		$(cmake-utils_use_find_package egl EGL)
 		-DBUILD_OSG_EXAMPLES=$(usex examples)
 		$(cmake-utils_use_find_package ffmpeg FFmpeg)
@@ -120,6 +121,7 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
 		$(cmake-utils_use_find_package openexr OpenEXR)
 		$(cmake-utils_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
 		$(cmake-utils_use_find_package pdf Poppler-glib)
 		$(cmake-utils_use_find_package png PNG)
 		$(cmake-utils_use_find_package sdl SDL)