Fix xcm test (bug 492374, thanks Nikoli), version bump, update HOMEPAGE, fix DEPENDS.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 81 insertions, 54 deletions

diff --git a/media-gfx/icc_examin/ChangeLog b/media-gfx/icc_examin/ChangeLog
index 3443575a7d73..cc1dd05d5008 100644
--- a/media-gfx/icc_examin/ChangeLog
+++ b/media-gfx/icc_examin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/icc_examin
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/ChangeLog,v 1.5 2013/01/21 07:36:49 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/ChangeLog,v 1.6 2014/07/31 06:39:45 xmw Exp $
+
+*icc_examin-0.55 (31 Jul 2014)
+
+  31 Jul 2014; Michael Weber <xmw@gentoo.org>
+  +files/icc_examin-0.54-fix-xcm-test.patch,
+  +files/icc_examin-0.55-fix-xrandr-test.patch, +icc_examin-0.55.ebuild,
+  -icc_examin-0.51.ebuild, -icc_examin-0.52.ebuild, icc_examin-0.54.ebuild:
+  Fix xcm test (bug 492374, thanks Nikoli), version bump, update HOMEPAGE, fix
+  DEPENDS.
 
 *icc_examin-0.54 (21 Jan 2013)
 
@@ -29,4 +38,3 @@
   08 Feb 2012; Michael Weber <xmw@gentoo.org> +icc_examin-0.50.ebuild,
   +metadata.xml:
   Initial import
-
diff --git a/media-gfx/icc_examin/files/icc_examin-0.54-fix-xcm-test.patch b/media-gfx/icc_examin/files/icc_examin-0.54-fix-xcm-test.patch
new file mode 100644
index 000000000000..099a485b0a07
--- /dev/null
+++ b/media-gfx/icc_examin/files/icc_examin-0.54-fix-xcm-test.patch
@@ -0,0 +1,11 @@
+--- icc_examin-0.54/configure_tests.sh
++++ icc_examin-0.54/configure_tests.sh
+@@ -543,7 +543,7 @@
+     if [ -z "$found" ]; then
+       pkg-config  --atleast-version=0.2 $pc_package
+       if [ $? = 0 ]; then
+-        found=`pkg-config --cflags $pc_package`
++        found=" "`pkg-config --cflags $pc_package`
+         version=`pkg-config --modversion $pc_package`
+       fi
+     fi
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
new file mode 100644
index 000000000000..51046058422d
--- /dev/null
+++ b/media-gfx/icc_examin/files/icc_examin-0.55-fix-xrandr-test.patch
@@ -0,0 +1,21 @@
+--- 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.52.ebuild b/media-gfx/icc_examin/icc_examin-0.52.ebuild
deleted file mode 100644
index ea7c8379a1c7..000000000000
--- a/media-gfx/icc_examin/icc_examin-0.52.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/icc_examin-0.52.ebuild,v 1.1 2012/11/04 17:17:18 xmw Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and video card gamma tables"
-HOMEPAGE="http://www.behrmann.name/index.php?option=com_content&task=view&id=99&Itemid=1&lang=de"
-SRC_URI="mirror://sourceforge/oyranos/ICC%20Examin/ICC%20Examin%20${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/ftgl
-	media-libs/oyranos
-	x11-libs/fltk"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	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.54.ebuild b/media-gfx/icc_examin/icc_examin-0.54.ebuild
index 2515a18c7485..b2bd1013ed90 100644
--- a/media-gfx/icc_examin/icc_examin-0.54.ebuild
+++ b/media-gfx/icc_examin/icc_examin-0.54.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/icc_examin-0.54.ebuild,v 1.1 2013/01/21 07:36:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/icc_examin-0.54.ebuild,v 1.2 2014/07/31 06:39:45 xmw Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and video card gamma tables"
-HOMEPAGE="http://www.behrmann.name/index.php?option=com_content&task=view&id=99&Itemid=1&lang=de"
+HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
 SRC_URI="mirror://sourceforge/oyranos/ICC%20Examin/ICC%20Examin%20${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -15,14 +15,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/ftgl
-	>=media-libs/libXcm-0.5.2
-	media-libs/oyranos
-	x11-libs/fltk"
-
-DEPEND="${RDEPEND}"
+RDEPEND="app-admin/elektra
+	media-libs/ftgl
+	media-libs/libXcm
+	<media-libs/oyranos-0.9.5
+	media-libs/tiff
+	x11-libs/fltk
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.54-fix-xcm-test.patch
+
 	sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
 		-i makefile.in
 }
diff --git a/media-gfx/icc_examin/icc_examin-0.51.ebuild b/media-gfx/icc_examin/icc_examin-0.55.ebuild
index 7d5a3c093a3a..28b473855eed 100644
--- a/media-gfx/icc_examin/icc_examin-0.51.ebuild
+++ b/media-gfx/icc_examin/icc_examin-0.55.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/icc_examin-0.51.ebuild,v 1.2 2012/11/04 17:17:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icc_examin/icc_examin-0.55.ebuild,v 1.1 2014/07/31 06:39:45 xmw Exp $
 
 EAPI=4
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="viewer for ICC and CGATS profiles, argylls gamut vrml visualisations and video card gamma tables"
-HOMEPAGE="http://www.oyranos.org/icc-examin"
+HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=ICC_Examin"
 SRC_URI="mirror://sourceforge/oyranos/ICC%20Examin/ICC%20Examin%20${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -15,14 +15,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/ftgl
-	media-libs/oyranos
-	x11-libs/fltk"
+RDEPEND="app-admin/elektra
+	media-libs/ftgl
+	media-libs/libXcm
+	>=media-libs/oyranos-0.9.5
+	media-libs/tiff
+	x11-libs/fltk
+	x11-libs/libX11
+	x11-libs/libXinerama
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm"
 
 DEPEND="${RDEPEND}
-	sys-devel/libtool"
+	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.55-fix-xrandr-test.patch
+
 	sed -e '/xdg-icon-resource\|xdg-desktop-menu/d' \
 		-i makefile.in
 }