[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-color-manager/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     bb3d122c3f1a4298d9b82a26f9d9d1b53806e551
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 01:22:51 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 01:22:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bb3d122c

gnome-extra/gnome-color-manager: 3.8.3 → 3.10.1

---
 ...99.ebuild => gnome-color-manager-3.10.1.ebuild} | 26 ++++++----------------
 .../gnome-color-manager-9999.ebuild                | 10 ++++-----
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild
similarity index 76%
copy from gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
copy to gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild
index 8c46988..1941b6b 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild
@@ -4,23 +4,15 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Color profile manager for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clutter packagekit raw"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
@@ -36,17 +28,18 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/vte-0.25.1:2.90
+	>=x11-misc/colord-0.1.34
 	>=x11-libs/colord-gtk-0.1.20
 
 	clutter? (
-		>=media-libs/clutter-1.9.11:1.0
+		>=media-libs/clutter-1.12: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 )"
+RDEPEND="${COMMON_DEPEND}"
+
 # docbook-sgml-{utils,dtd:4.1} needed to generate man pages
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-dtd:4.1
@@ -56,23 +49,18 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools"
-fi
-
 # FIXME: run test-suite with files on live file-system
 RESTRICT="test"
 
 src_configure() {
 	# Always enable tests since they are check_PROGRAMS anyway
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--disable-static \
 		--enable-tests \
 		$(use_enable clutter) \
 		$(use_enable packagekit) \
-		$(use_enable raw exiv)
+		$(use_enable raw exiv) \
+		ITSTOOL=$(type -P true)
 }
 
 pkg_postinst() {

diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
index 8c46988..5dcb208 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
@@ -4,7 +4,6 @@
 
 EAPI="5"
 GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -19,7 +18,7 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 IUSE="clutter packagekit raw"
 
@@ -36,17 +35,18 @@ COMMON_DEPEND="
 	x11-libs/libXrandr
 	>=x11-libs/gtk+-3.3.8:3
 	>=x11-libs/vte-0.25.1:2.90
+	>=x11-misc/colord-0.1.34
 	>=x11-libs/colord-gtk-0.1.20
 
 	clutter? (
-		>=media-libs/clutter-1.9.11:1.0
+		>=media-libs/clutter-1.12: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 )"
+RDEPEND="${COMMON_DEPEND}"
+
 # docbook-sgml-{utils,dtd:4.1} needed to generate man pages
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-dtd:4.1