gentoo resync : 15.01.2020

5 files changed, 54 insertions, 8 deletions

diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index d9e8451edab0..dafcace3f48c 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,5 +1,7 @@
+AUX oyranos-0.9.6-mesa-18.3.1.patch 834 BLAKE2B f8cae2cdb21c4588cc1f89c9989ea95c71d200b69d1341fbdaf7dda2a17278350bec2b887f9965cd7838b4ca67d710588bb978a0805b66927afc5f29777e51c7 SHA512 6d590754543b94a8a2558a92dc0610a2df37a55a05ddfabf166004fc6fff29a38b4e5919a91b0dd1a03256da349a8167790e2eceeb00519df7de2ad95eeb08b9
+AUX oyranos-0.9.6-underlinking.patch 1064 BLAKE2B e05060b0bd88b8ca3edb36f2e9d86b5d2296e16f13420a14473a7b0273bf9b53fdea57cbd6ae4828c3b63d4ec8025757e5b9a4858378861d42f83f537155b2fc SHA512 19b22636294c74a44cad38ff4e795a110154349e89715104afd014a219e254a3749a1e9e59b37ce14f01fe22653c6ae062e11e587456b19c8012cc1315699b09
 DIST oyranos-0.9.6-patches.tar.xz 11680 BLAKE2B 2e082ce2bd091dcb59a92662ec813504fbacf03d452f54260434c3abcd63523b1c718055bb0ea2576202b3f85b4af2b36975902163991e4fe82e8e52f714cf5a SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493
 DIST oyranos-0.9.6.tar.gz 2247841 BLAKE2B b086104e2de949ec08a452fbab16c219daf36a69771f766fafeccffcdb45b74ff9b4d7754f45896c04d04f3fa78fb1faa1ae898b0594d172dd5e6355ca58af9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111
-EBUILD oyranos-0.9.6-r1.ebuild 2732 BLAKE2B 0ca09c3d16074206b922d7bb80940d24e7c0fc090606949e1116c50a1208dd507f224b8b5fffb08f618e818c2ecd6d34f748d768d7b5b0e785958490a6b2af05 SHA512 d2a7e3c754974a2bef6c8f47c331a43437eae4176e042d857f2441ad4899dd44e5cd0f880cd6787ea3fbf7d9fc4f1459276e45c031a90bebcb9ba19364f4822f
-EBUILD oyranos-9999.ebuild 2645 BLAKE2B 93eb8738c198b753535d90824713dd042b82ea5e0aa41045148f8c08f8a7df18072991e39aa9c0adba36c421b299f616448a4cc774d3bd5538c7c226eed51e70 SHA512 ecc3a301e27e646c6d0624eae679f59c1a36eeefc0c1a9ee170e08447c9b0d26c090abc44bee82ae43171f0979c2b04380cff9436a64863cf88e7196c92ce296
+EBUILD oyranos-0.9.6-r1.ebuild 2818 BLAKE2B 1306b22453dfa535ee4713ceb7435eb069f79c077b7b8ce426b9b67d829e3adba811808e2bb25227d555162567588aa7ac8dbecc6501699033e083cf0ebca582 SHA512 b8081efd598425c490831cc4ea93ce2d8edfde46df4d54b67cdb131c1ec8ff4a7f526a78edb0ba943b3c87ecf79cc23e0e6cb9917a02ca681a03f5944eedfe96
+EBUILD oyranos-9999.ebuild 2640 BLAKE2B a20355ed811718826051659b1f809b5f2ec9e0d6ec496783a79f39d84e184a29368a48977d90bf975b25cd18f5042dadcd47cf17369cf0024d550de37aab2454 SHA512 e21797926479e96829500abec17d16980a98e331c85dddc4c60de04c99bd1d18c4f63bb478ee8e214515394680c2cdf4af020471b5342400be083aad1dc07749
 MISC metadata.xml 251 BLAKE2B 0999a9b822622949e7ddd1e5d5b77cd32cf1f689c715a8e9d4c2a4a312d8f59bf2efd06c84f52d71b05149e51514c4f4cecaf30a2c8ab391dcb3a5f7957d7b7e SHA512 bd232a6e37c4b956d15fd9fb66e3b7698c41747b9d3a1b474e8f41a1d7a0d841308526f9ba6a5b250f0140c1af47353bb0adc2e08d09bf8ef52c7b09e66ab891
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch
new file mode 100644
index 000000000000..83ed82a5629a
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch
@@ -0,0 +1,24 @@
+From ac7bdc35ea376f938ad223b0156a04a2af6d2eff Mon Sep 17 00:00:00 2001
+From: Kai-Uwe Behrmann <ku.b@gmx.de>
+Date: Fri, 28 Dec 2018 00:14:24 +0100
+Subject: [PATCH] * [exmpl]: update GLee.h to Mesa-18.3.1
+
+the include guards of system files changed
+---
+ src/examples/image_display/GLee.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/examples/image_display/GLee.h b/src/examples/image_display/GLee.h
+index 2edca003..01b19c68 100644
+--- a/src/examples/image_display/GLee.h
++++ b/src/examples/image_display/GLee.h
+@@ -61,7 +61,9 @@
+ 	#include <OpenGL/gl.h>
+ #else // GLX
+ 	#define __glext_h_  /* prevent glext.h from being included  */
++	#define __gl_glext_h_
+ 	#define __glxext_h_ /* prevent glxext.h from being included */
++	#define __glx_glxext_h_
+ 	#define GLX_GLXEXT_PROTOTYPES
+ 	#include <GL/gl.h>
+ 	#include <GL/glx.h>
diff --git a/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch
new file mode 100644
index 000000000000..b25a36cf79e9
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.6-underlinking.patch
@@ -0,0 +1,16 @@
+Index: oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt
+===================================================================
+--- oyranos-0.9.6.orig/src/modules/color/modules/CMakeLists.txt
++++ oyranos-0.9.6/src/modules/color/modules/CMakeLists.txt
+@@ -74,9 +74,9 @@ SET( OY_MODULE oydi )
+ SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
+ ADD_LIBRARY( ${OY_MODULE_LIB}
+              SHARED ${PACKAGE_NAME}_cmm_${OY_MODULE}.c )
+-TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} )
++TARGET_LINK_LIBRARIES ( ${OY_MODULE_LIB} ${PROJECT_NAME} ${EXTRA_LIBS} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} )
+ INSTALL (TARGETS ${OY_MODULE_LIB} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OY_CMMSUBPATH})
+-SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} )
++SET( OY_MODULE_LIBRARIES ${OY_MODULE_LIBRARIES} ${XCM_LIBRARIES} ${XFIXES_LIBRARIES} ${X11_LIBRARIES} )
+ 
+ SET( OY_MODULE oyra )
+ SET( OY_MODULE_LIB ${PACKAGE_NAME}_${OY_MODULE}${OY_MODULE_NAME} )
diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
index 05b026fa3e9d..4eee55d10f7d 100644
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6-r1.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
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic xdg
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
 HOMEPAGE="https://www.oyranos.org/"
@@ -69,7 +69,11 @@ DOCS=( {AUTHORS,ChangeLog,README}.md )
 
 RESTRICT="test"
 
-PATCHES=( "${WORKDIR}/patches" )
+PATCHES=(
+	"${WORKDIR}/patches"
+	"${FILESDIR}/${P}-mesa-18.3.1.patch" # bug 671996
+	"${FILESDIR}/${P}-underlinking.patch"
+)
 
 src_prepare() {
 	# remove bundled libs
@@ -77,7 +81,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 		-DUSE_SYSTEM_ELEKTRA=ON
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index a44af27aa9ea..9d14bb4f921a 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS"
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic xdg
 
 DESCRIPTION="Colour management system allowing to share settings across apps and services"
 HOMEPAGE="https://www.oyranos.org/"
@@ -74,7 +74,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 		-DUSE_SYSTEM_ELEKTRA=ON