Version bump. Update shared-color-profile dependency since it has been merged into colord.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 87 insertions, 6 deletions

diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog
index 65b098a74e44..a2758112d7ae 100644
--- a/gnome-extra/gnome-color-manager/ChangeLog
+++ b/gnome-extra/gnome-color-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-color-manager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.29 2013/01/06 09:38:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.30 2013/01/22 07:25:06 tetromino Exp $
+
+*gnome-color-manager-3.6.1 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-color-manager-3.4.2.ebuild, gnome-color-manager-3.6.0.ebuild,
+  +gnome-color-manager-3.6.1.ebuild:
+  Version bump. Update shared-color-profile dependency since it has been merged
+  into colord.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   gnome-color-manager-3.6.0.ebuild:
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild
index 616fa8947c05..b2ebbd11d7d2 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild,v 1.2 2012/07/02 22:26:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.4.2.ebuild,v 1.3 2013/01/22 07:25:06 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -39,7 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.10:2
 	raw? ( media-gfx/exiv2 )
 "
 RDEPEND="${COMMON_DEPEND}
-	media-gfx/shared-color-profiles
+	|| ( >=x11-misc/colord-0.1.27 media-gfx/shared-color-profiles )
 "
 # docbook-sgml-{utils,dtd:4.1} needed to generate man pages
 DEPEND="${COMMON_DEPEND}
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
index 8b004aee7a2f..87e0da8efa74 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild,v 1.6 2013/01/06 09:38:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild,v 1.7 2013/01/22 07:25:06 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -39,7 +39,7 @@ COMMON_DEPEND="
 	raw? ( media-gfx/exiv2 )
 "
 RDEPEND="${COMMON_DEPEND}
-	media-gfx/shared-color-profiles"
+	|| ( >=x11-misc/colord-0.1.27 media-gfx/shared-color-profiles )"
 # docbook-sgml-{utils,dtd:4.1} needed to generate man pages
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-dtd:4.1
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.1.ebuild
new file mode 100644
index 000000000000..fd9da66ff178
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.1.ebuild,v 1.1 2013/01/22 07:25:06 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Color profile manager for the GNOME desktop"
+HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clutter packagekit raw"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.10:2
+	gnome-base/gnome-desktop:3=
+	>=media-libs/lcms-2.2:2
+	>=media-libs/libcanberra-0.10[gtk3]
+	media-libs/libexif
+	media-libs/tiff
+
+	x11-libs/libX11
+	x11-libs/libXrandr
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/vte-0.25.1:2.90
+	>=x11-libs/colord-gtk-0.1.20
+
+	clutter? (
+		>=media-libs/clutter-1.9.11:1.0
+		media-libs/clutter-gtk:1.0
+		media-libs/mash:0.2 )
+	packagekit? ( app-admin/packagekit-base )
+	raw? ( media-gfx/exiv2 )
+"
+RDEPEND="${COMMON_DEPEND}
+	|| ( >=x11-misc/colord-0.1.27 media-gfx/shared-color-profiles )"
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+# FIXME: run test-suite with files on live file-system
+RESTRICT="test"
+
+src_configure() {
+	# Always enable tests since they are check_PROGRAMS anyway
+	gnome2_src_configure \
+		--disable-static \
+		--enable-tests \
+		$(use_enable clutter) \
+		$(use_enable packagekit) \
+		$(use_enable raw exiv) \
+		ITSTOOL=$(type -P true)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version media-gfx/argyllcms ; then
+		elog "If you want to do display or scanner calibration, you will need to"
+		elog "install media-gfx/argyllcms"
+	fi
+}