gentoo resync : 06.08.2019

3 files changed, 8 insertions, 10 deletions

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index d9e553df2a3b..5ded17ade790 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -4,6 +4,6 @@ AUX openscenegraph-3.6.3-cmake.patch 993 BLAKE2B 3adb6691bb1c2e9cc4e88ef5c1e107b
 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
-EBUILD openscenegraph-3.5.5.ebuild 3789 BLAKE2B a83f1017bd1add8f5b15cddb48dfa22818ad4ab4a109a9755af76b50625623cfca83d0cb4eb3a74b2f22701b1e6126195313671c333bb237b482bb5525dbfb6f SHA512 1587e604a77f4d6ed367eca0aa83a492523a5b1689f766798c8f57109ae4d88fd77f46e02e8a324907e303b31ba1fd9c65e2464a5ea15b67dbfd5d38b4c1a110
-EBUILD openscenegraph-3.6.3.ebuild 4379 BLAKE2B 9c45ab18686e98fafe495d4002c573e53815371c2cf7271cf6cfd2685d583b23d95cb3941a1370572fabae7c8b03014e13f5645b5a165f272b2d71242e1b281f SHA512 445504f7d7f523303faf1ab27ca5a5f81d7635b809a4000bb7b6e3e11abdba40d661cc08812da8b32b37efd738c4dc3265f1c5c3bdc3fc8d614ba216b9a20ff4
+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
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
index 7b066c0abf2c..29582ffe9098 100644
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.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,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1"
 SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
 KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86"
 IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg
-jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
+las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xine xrandr zlib"
 
 REQUIRED_USE="sdl2? ( sdl )"
@@ -49,7 +49,6 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	las? ( >=sci-geosciences/liblas-1.8.0 )
 	lua? ( >=dev-lang/lua-5.1.5:* )
 	openexr? (
@@ -112,7 +111,7 @@ src_configure() {
 		-DWITH_GLIB=$(usex gstreamer)
 		-DWITH_GtkGl=$(usex gtk)
 		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_Jasper=$(usex jpeg2k)
+		-DWITH_Jasper=OFF
 		-DWITH_LIBLAS=$(usex las)
 		-DWITH_Lua=$(usex lua)
 		-DWITH_OpenEXR=$(usex openexr)
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild
index b1bbf9578d9a..995535e2ff3c 100644
--- a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ 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
-jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
+las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff
 truetype vnc wxwidgets xrandr zlib"
 
 REQUIRED_USE="sdl2? ( sdl )"
@@ -49,7 +49,6 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/jasper:= )
 	las? ( >=sci-geosciences/liblas-1.8.0 )
 	lua? ( >=dev-lang/lua-5.1.5:* )
 	openexr? (
@@ -114,7 +113,7 @@ src_configure() {
 		$(cmake-utils_use_find_package gstreamer GStreamer)
 		$(cmake-utils_use_find_package gtk GtkGl)
 		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
 		$(cmake-utils_use_find_package las LIBLAS)
 		$(cmake-utils_use_find_package lua Lua51)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON