gentoo resync : 15.10.2017

6 files changed, 115 insertions, 94 deletions

diff --git a/media-gfx/icc_examin/Manifest b/media-gfx/icc_examin/Manifest
index 8b35e56de25b..346a8579dcc7 100644
--- a/media-gfx/icc_examin/Manifest
+++ b/media-gfx/icc_examin/Manifest
@@ -1,7 +1,7 @@
-AUX icc_examin-0.55-fix-xrandr-test.patch 896 SHA256 1b8e840dd1e4f9183e8a2110af6413c3a4aeebc926bfdf4f586c315ef67bab05 SHA512 a7226ece057eb4ef215852a99437efc57f8173021dffc82e1e7f480832a4cd8fb5f8a76a0eedf450dca42b1346c9871e63b83d24e02c43ae8721c403e85b2379 WHIRLPOOL 8d11b3e9ba57a85b67f699ca2d901a39dd637e7be7c67c42ef3768c39c022f39705e89c652c25e0192225fb2ab8c2c3414bc2806dfa8dc165421a741a6d778c5
-DIST icc_examin-0.55.tar.gz 692711 SHA256 6a6036e4724845368c2ade86c3d29e9cf0e09801f704d02f45ed2b2481924bab SHA512 503d932890c747b9111167df360e9deedd985a4cd434610a6c0de42d4d36ff22907c1441485731349661ddab85d39268fcfc69c035601c1066ec9b63566f491a WHIRLPOOL b6014338eb79e3ac2bdbbb7e4f817a49cca0d34e6dc3b10fe74f6bc4cc1c85d57d7b76d53574aebdcb7dff599a1f0ade1f809006ada01977361d59a64ca8d413
-EBUILD icc_examin-0.55-r1.ebuild 976 SHA256 995cff1cb94c465e28f04c6bf14429f84ab76858aa77cf16bd3c00fb7003d302 SHA512 ce29066e0b6d7d91486de60dc3f09495924e4b090d7d60020b0e7cc75f2cce4e5e037a16ec198df18f9e5dad6d4e0cfa21bf66d47410f02b1aed6dd0f003b6d6 WHIRLPOOL 9df97471442c8b0e2f03cf2cc19f9b663d5a648115545c94a58c97b2c70b7782b12e718619312ea3a5f394a4f52fe5ce9e7dfcf92a75c328168a1be19124cf69
-EBUILD icc_examin-9999.ebuild 921 SHA256 f76cb47ac872189f02bebff881686d4003ecec34e0ec194d707bd0f4d75729cb SHA512 2f04f522df9bf49bbd8d676fadf9d5414ef94f9396591efa8eb425f270c1d51110b80036a759afbc7bd20a35a7d36a102e866a232078109e92c23bd6643898cd WHIRLPOOL d7f87cb4242753acf067f5a0ff1612a12f75f735305401aaaa04745c420572084df810b3aeb5a33ecb87ec357b3b9da5c8628f22e32f45f368c523bef99414e8
+AUX icc-examin-0.56-fltk.patch 754 SHA256 a8d92211bbb2dd67607c291ffabac47de84972926ee04ebf46540a7e5b7e6601 SHA512 ae8bb21951107f9424abafe81015fba13556b2eaaf49f16a6694ce68e7f86ea4cff1d977364dd7c3c3fd5c7163739860a0f0ec74b28200c7d0f0ad2c43711f0c WHIRLPOOL ab01a5b6e9240cf1106408e674ba4d6c4548b86c75ece6e46017b814259de9004a6a1dcdb1c9e7f147f0dd9fe09850011be37fa33a6c8d30f1d383fd9e0af55b
+DIST icc-examin-0.56_p20171007.tar.gz 724698 SHA256 1a7acd84a9891284d84f025baa37b97823fa6708e4b5b26be5f58d52381d12aa SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6 WHIRLPOOL ef06562d25b172ee9aaef143422e0403a89dd0731a9d33a56fd6a60ac560e6f3e66b1bba14c9980feb6a288b4cff1dc2daf9458ca1034ab1c63140bf24b5ea80
+EBUILD icc_examin-0.56_p20171007.ebuild 1117 SHA256 ae5e3a2c5941ab3575d586d91638f0279a7fa7d4ccbe21eaa4d614b6752f9de8 SHA512 678456e641ed9ef1a91401dac6c3a80ba66c145885521b1d3ec3d68c4e3ac83fa938351876e6b0fb698686261185605bac7d0bcdffd0f7692873cb4170896da9 WHIRLPOOL 5b01aa58dca3e9c27a673f5740b683eefb4af352dcb4c2a45fbe2065a24ee4045d41a499e66b18d95804418560c20563b6afcef0283645ea7f8c2f72577c210b
+EBUILD icc_examin-9999.ebuild 1000 SHA256 6c3a1ef649e395dc076c3d45eee288fecc8719d62f4ee978fbb41ca6b6c35908 SHA512 1a068527b8785ace85775815d5d3296ea4d9e19bcd1caac8ae5a066e547db75aaaa82b1e280b6be939bad351052d0a79dc87f78d5608b4f439fec26c698088ce WHIRLPOOL 8adc0bfc82c8c20e87e03caef56428c4e2e3054983cd45c50acca46eadb0d7d1216b29812e8d90aaf7a9a460fdec3858fbcb1bb5350ad53c3a5b315da62c7a01
 MISC ChangeLog 3200 SHA256 f6c0aead1cf65cb3e260a517e7bfaf2e7776945ce54aed6a0ab9fd2f50f113e4 SHA512 1b911e869e7c1c59eace132e2a67491c911da8f79b5ef1b0c45e41f513038ca7429ad69749f996666c40083b19fc85166d32b715e9fa8c8bb3eb719add7d8c93 WHIRLPOOL 35f21a77e9893bbe286718c17f4cc67fcc492397d92c30e8fd57ea852922e8fd37681bd64f9f43f8e81fed1bb5c31610222f04d9f913092a29d32c847260d183
 MISC ChangeLog-2015 1796 SHA256 0bc367d031970d60d3c0b0cdb5be9ef821880e395ed48d66ae0a744f82db5755 SHA512 8ab752449e672fa12661b15e2faa661dc86f75462fdfb9cbde53f007657acd1c0ad0c4c5d141ece2a206f8a6fedd13c0824ae4ca3338e10575bd233eaaa189fe WHIRLPOOL f4c5e6604b60f4aac5df7c6a3709ddfbf10d0ac809cf2d7a499ad069d13aea333e0ccbdbe787d15abae3f16b4c81c70ac263641780ccf3c060e72cc06a1f7961
 MISC metadata.xml 382 SHA256 32192873b2fe6313f1382602937b93d69869936bf5de03c3ea88278d281a6333 SHA512 7a5dc10551b676b47699b1a41a1016528efd794de47216fbf68eea9645cb4db32179eacf87fb4b986308b9a64c0cfd36406ed8326859e5247c8f9eb6083be8be WHIRLPOOL 47ac441ea4d3cfe460c4a71981980ba2c9cc670ece3ea47efedfe5a0852af154c739123839a2dbb523cca52dfb338bc93f12edda93bb54cdc16da45728bc3649
diff --git a/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
new file mode 100644
index 000000000000..5e4645a8b0ef
--- /dev/null
+++ b/media-gfx/icc_examin/files/icc-examin-0.56-fltk.patch
@@ -0,0 +1,27 @@
+From 172889b358d0801da8d2c15196129cd911e3afc1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 14 Oct 2017 18:59:20 +0200
+Subject: [PATCH] Fix FLTK include and libs
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 60ee08a..41f7c61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -103,8 +103,8 @@ IF(FLTK_FOUND)
+     SET( FLTK_ADD_LIBS "fltk_jpeg" )
+   ENDIF( NOT JPEG_FOUND )
+ ENDIF(FLTK_FOUND)
+-INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
+-LINK_DIRECTORIES( ${FLTK_LIBRARY_DIRS} )
++INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} )
++LINK_DIRECTORIES( ${FLTK_LIBRARIES} )
+ 
+ FIND_PACKAGE( OpenGL )
+ IF(OPENGL_FOUND)
+-- 
+2.14.2
+
diff --git a/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch b/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch
deleted file mode 100644
index b9acf4c2d049..000000000000
--- a/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream as https://sourceforge.net/p/oyranos/patches/6/
-
-Michael Weber
-
---- icc_examin-0.55/configure_tests.sh
-+++ icc_examin-0.55/configure_tests.sh
-@@ -689,7 +689,8 @@
-     if [ -z "$found" ]; then
-       pkg-config  --atleast-version=1.2 $pc_package
-       if [ $? = 0 ]; then
--        found=`pkg-config --cflags $pc_package`
-+	found="yes"
-+        cflags=`pkg-config --cflags $pc_package`
-         version=`pkg-config --modversion $pc_package`
-       fi
-     fi
-@@ -703,7 +704,7 @@
-       if [ -n "$MAKEFILE_DIR" ]; then
-         for i in $MAKEFILE_DIR; do
-           test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR = 1" >> "$i/makefile"
--          test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR_INC = $found" >> "$i/makefile"
-+          test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR_INC = $cflags" >> "$i/makefile"
-         done
-       fi
-     elif [ $OSUNAME = "Linux" ]; then
diff --git a/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild b/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild
deleted file mode 100644
index bceddcfdbc66..000000000000
--- a/media-gfx/icc_examin/icc_examin-0.55-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
-SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/elektra
-	media-libs/ftgl
-	media-libs/libXcm
-	=media-libs/oyranos-0.9.5*
-	media-libs/tiff:0
-	x11-libs/fltk
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch
-
-	sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
-		-i makefile.in
-}
-
-src_configure() {
-	tc-export CC CXX
-	econf --enable-verbose \
-		--disable-static
-}
diff --git a/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
new file mode 100644
index 000000000000..fd9e3b7ee0e5
--- /dev/null
+++ b/media-gfx/icc_examin/icc_examin-0.56_p20171007.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=ee9e8cd013766b0df2c5e3b4416f985322b22966
+inherit cmake-utils flag-o-matic vcs-snapshot xdg-utils
+
+DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
+HOMEPAGE="http://www.oyranos.org/icc-examin/"
+SRC_URI="https://github.com/oyranos-cms/${PN/_/-}/tarball/${COMMIT} -> ${P/_/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/elektra
+	media-libs/freetype
+	media-libs/ftgl
+	media-libs/libXcm[X]
+	media-libs/oyranos
+	media-libs/tiff:0
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/fltk[opengl]
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/libintl
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
+
+S="${WORKDIR}/${P/_/-}"
+
+src_configure() {
+	append-cxxflags -fpermissive
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/icc_examin/icc_examin-9999.ebuild b/media-gfx/icc_examin/icc_examin-9999.ebuild
index 045fa7a82065..ceb2821c90c8 100644
--- a/media-gfx/icc_examin/icc_examin-9999.ebuild
+++ b/media-gfx/icc_examin/icc_examin-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs git-r3
+inherit cmake-utils flag-o-matic git-r3 xdg-utils
 
-DESCRIPTION="Viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
+DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
+HOMEPAGE="http://www.oyranos.org/icc-examin/"
 EGIT_REPO_URI="https://github.com/oyranos-cms/${PN/_/-}.git"
 
 LICENSE="GPL-2"
@@ -14,30 +14,39 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-admin/elektra
+RDEPEND="
+	app-admin/elektra
+	media-libs/freetype
 	media-libs/ftgl
-	media-libs/libXcm
-	=media-libs/oyranos-9999
+	media-libs/libXcm[X]
+	media-libs/oyranos
 	media-libs/tiff:0
-	x11-libs/fltk
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/fltk[opengl]
 	x11-libs/libX11
 	x11-libs/libXinerama
 	x11-libs/libXpm
 	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-
+	x11-libs/libXxf86vm
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	sys-devel/gettext
+	virtual/libintl
+	virtual/pkgconfig
+"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch
+PATCHES=( "${FILESDIR}/${PN/_/-}-0.56-fltk.patch" )
 
-	sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
-		-i makefile.in
+src_configure() {
+	append-cxxflags -fpermissive
+	cmake-utils_src_configure
 }
 
-src_configure() {
-	tc-export CC CXX
-	econf --enable-verbose \
-		--disable-static
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
 }