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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 93 insertions, 64 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/Manifest b/media-gfx/icc_examin/Manifest
index b229f5df5add..6589bb768640 100644
--- a/media-gfx/icc_examin/Manifest
+++ b/media-gfx/icc_examin/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST icc_examin-0.51.tar.bz2 579532 SHA256 8fa4d74167a0d423e95a8557320030fa79863492693b45171fa58f0bee4566bc SHA512 244f91074b059619db8ace2937c98b8979596a24d7394aeed94f72b285c661f58494d9d4e4163e0a03e95460fffc8a539f0b119f81e81daf886d57a44ad13402 WHIRLPOOL a915abeb766d9b1bb573bdef8594aa3d3db7dda1423912c440272ec017509b35fcccda076460c03f92aa615126f3af33103398666af70b9421a12efd6d151b51
-DIST icc_examin-0.52.tar.bz2 587609 SHA256 b39fab76f0d9cbce13229e0a7f2e6f22842e4fe149a3a181ed1fb998748027d1 SHA512 cece41906cdcff0958a5175f91df326725c6b97037b630e4ce6b85ca35edfa43bb293cdc6fe0cdac20998f77645759e79d814a3dcdb7f89836198bd63e3fbbfd WHIRLPOOL affd7b43227e0935c8a7e2fd60610890e65a7d39d3d5aca72caee40be1f3cde08498fefb9e450367f9b898e559615d7434641cdefed66529e725ed03048ffd87
+AUX icc_examin-0.54-fix-xcm-test.patch 382 SHA256 0bf7b0270ad4c279fe1f55bc8721bb0db9871b735b26a73f1d659115e02b4815 SHA512 53b0b868aebee3968b120ea8f0dc2fc4a32b9008fe3d7dce11b0ebdb5e85829fd3594596850bcf6d4db81cadc42dbeb5f99f1413822b2fcb7d611520ff14837d WHIRLPOOL 786225d08696aced8a20d2ed29125d261183b622a25b0f0bdb39a046dea5bf9a144b7549caa8601ea074523cf117d560eac419d02af9a355ef9395b34a15a7db
+AUX icc_examin-0.55-fix-xrandr-test.patch 823 SHA256 b23bbff6b2394f261fe8a59a0feac804ea8e05562461092a2e59a89f7c22dd41 SHA512 37419d704df68cc00c327b5f2a18dac3433b59092782fbd881c41bc877d955973d71563a49ce8190450a2cc824ba7971b29af6ff85cccc66b5d3d795f35b6c1e WHIRLPOOL 05af265deecd1810d54403aca9e0b353cbb51bbf5b4d19e0cc28e64733090bcd09fe938784bdf874e4a48ceed5e023674c5d5e3f464975877df9d90dab2ccbf5
 DIST icc_examin-0.53.tar.bz2 593369 SHA256 cb92c51ee5fb6319d54e1a33b4616d7ef54140820ce4f52b606373ba090998eb SHA512 86a9f8fe0e035e03e112a7371ba4076513d166f03b30e01ee63488811de9a36c3df563f98145665248dbef5b4e124bf0c0b53cf50bb0b8ebd93662d6c2adb2ff WHIRLPOOL 048a9b2942367c1e76529f8748164aa31e758df6a16e1d640fdb5a2e1d44c1a59be2525d384d8deca57dc25d6de5c95549c253e647082d1e1165a626e7017f0d
 DIST icc_examin-0.54.tar.bz2 593684 SHA256 d5bb5c21ee0390b56b75865e3023e6465aa39daa3f22e26cf55d8cdd37638f64 SHA512 2704713088dde3735e84e4694a9a5d09127f3e03eea062a9018d6e357f3d64f980c75d16e5c92befa1eebd30d9964e9a55ad82df44ad244e9a0d2eddf5a800e5 WHIRLPOOL 1dc7e3ce9bb593c411d4388e3f76dbbdfd47c2f545fc172f83e478a932d834b487d53b9387142703cc2adf25132133b132161eb96a40dc597286ab457c35ce4d
-EBUILD icc_examin-0.51.ebuild 828 SHA256 70e15ff6868c431f3b31e78fb9cf8b811e440f29eac7ea0edb8cf362bf0748f4 SHA512 33f9b121fa2131d230a8a543e44021cede4f13f48859ea4390bc308bfe89f91eec6941f55cb0960140f354a93105a1601cebe6dcf566896b95b83495a6b7dc58 WHIRLPOOL f2953a1cd5e29c285858bd7a10b7977f94857a7f38daf47cb47dc4470a39936279bcfd2a37ac2405c165a260eab7db5820f18ce2f53e609e7f59696ad858cda1
-EBUILD icc_examin-0.52.ebuild 862 SHA256 b20d505d55d6d5a54ae472459c775481bb23493a56b05fc2f0cec39a827d2319 SHA512 be8c944aa68d2cd20da23532e0895a575626ee97092e5e724417f7fe7b27c92f813551935dcd5d516bbfdba424c45309c4b2224a27c089b2c5a8732e8d27a7ce WHIRLPOOL 4d5fad5fc736d2f38c5ec9170c358a63effc7eb233dc612c7d7adff9f7a164d1b9e7c81498d1818d130f7f259317a7c1eb7329aad53a523fa2c074fd8ec9a27f
+DIST icc_examin-0.55.tar.bz2 594646 SHA256 e44fe003e5aa7bd70a5b137c094a3047b356755be376977a1aa402c65d0ba2fc SHA512 8355411048c5fff5d7e9d08feb9c42cc4d4f4590897fd42c1e9e9e7507b5ed0cc9beb4ade7c57df40cbc1255dc806aea2f03a3aca16d0c1438a743abe7571920 WHIRLPOOL 56babbca717975192a831129a6071e1c48fc2a7621a691d4283bb0e2296a899aec2060f771848122ddaab9170dcd6b510986959a0537227dae31facf49d2ead1
 EBUILD icc_examin-0.53.ebuild 889 SHA256 326e08f364356091bf49a7bc1f9de2ce1f89ca48a7f5ec1aa9de69a9e8dcd490 SHA512 d4388ce12d35a4bfa316081d518cc7e60ea573e7b7a4ba2da4fcca257e42d5df8781e737a30329f6140a2c7065e60b7c36e86b59bffbf69ade52c31b0885ccc0 WHIRLPOOL 50a1f878001e01cc02f0c8a4c68f3d00b7318e604ed691e4af75ec044ae1ba3499cf69a1a1cb297be5d5acfa55639053090ff30360b42de5452f6570f15ad240
-EBUILD icc_examin-0.54.ebuild 889 SHA256 3263d0fb54912bc4780c0b83d8286550c72b95145f619d77ba029a4d1957e117 SHA512 5ef818ad71dec082d34485ac33ca7725e1da81d78432264e876203b2db8581ac49e1571b2fbb4f63eda2cbd85fb7363d4e8ba20a903264f419c6e927084ec887 WHIRLPOOL a8233fb31cb584c96eeb34e71acc31a1cf8efaaf5739a908eb33561308a3ae499b804b363750a473c573f52ba1547533084866f344ad65788d77ea252e01ceb7
-MISC ChangeLog 943 SHA256 b82792b579d88597a5266b6bd6ba0246af77db9776be370f4aa58bd6afe7b63d SHA512 63096ab244f2086c818bb22994f87096bd621581a7bd6e6a1c8ed535436d24bd0f33dc3f5c151c2788b7563557676276557217e551a7125f7ae2d9bc685b0d98 WHIRLPOOL 821f0ed943c554b2f331b93d3fc64fceaf5bcb9de6d2457f01b0e307ea801475a39a75270c854eb1aca5f04cb0136080b1c7c625cf928be4120fd9a3d0c4a918
+EBUILD icc_examin-0.54.ebuild 1068 SHA256 9fea5fc1d5a5dbcde1625030839f11b9787b908f400602804054f00976e04991 SHA512 0bfd819773881d725522196f98f348e5610fb99846b57b211305bbd1c4bdc11314bd6c31e50ed98863a79b947fccb4b9a62f27bacb56bec543415dc7ff7b80e5 WHIRLPOOL 2475757671f166ac729b7467c9d2445eaa3ce1ed5f940308dc2abba6bd65630768941e93ab91e975b989ca8b6ef5399503bebad43ccd669b58de77a133fabddf
+EBUILD icc_examin-0.55.ebuild 1072 SHA256 1675bb0683225974305837ac2dc9bbb37e870dacb8d4580186abadbebdd12bd6 SHA512 afc199058928e9837c1c86295e8823285c62835211ef4c8cf12bc06c4e2530ef94d978955e951a3bd56eb90b690cc7239ea7785793800fa05a612f092a6f609c WHIRLPOOL e982dd62310e039b37dda5dfd84151dbe1b1d0bc58fda37d94ead1fcb4de2acd31a830c99b65dbd8f4eabdacd2788d0b4dcbc193cc718457b026b1a2b8da1381
+MISC ChangeLog 1305 SHA256 692e9fe8afc9ba9df30632c495b94d7933916040d10740dabc67046d13cf0eca SHA512 9053d960ac67cfa27518850540b35ea992e791dd0c4d2bafc9947a874e841f4f0c59d7508d641be25131d3423b5267b03eff099121beb64b41575e6a7a16d661 WHIRLPOOL b2336d46e9df88a6dacd72c4824ab0c5488bed511814494baab28e7ec38e1810a2d9a9134dcabd3d0ac36a414849c4f6837868a5f10ea341a9d0a23da81ae306
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlD88DcACgkQknrdDGLu8JCvUgD9F0PY8v6ZdNhcUDVawLLdi9ID
-n+SPB8/q2kXlBcKQaWEBAI/uWKEltAvF5iFJVokDHCRUZFF2kxRp9ofbS55OSnXC
-=5x2R
+iL4EAREIAGYFAlPZ5LhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
+N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JAe9QD+LvKGmVqIOlqfZYdJqXjoE5oY
+ZzRoEJQZ02gSr3y71Q4A/2ZjNzsDGpzClOl7I1ayp1y8UMeHjGPPirJyU7efPQsG
+=nKZm
 -----END PGP SIGNATURE-----
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
 }