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

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

commit:     2077a3e4216b5484d1056de6e2c1f81e75d4dd42
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 18:16:49 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 18:16:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2077a3e4

gnome-extra/gnome-color-manager: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

---
 .../gnome-color-manager-3.6.0.ebuild               |   83 --------------------
 .../gnome-color-manager-9999.ebuild                |   23 +++---
 gnome-extra/gnome-color-manager/metadata.xml       |   11 +++
 3 files changed, 24 insertions(+), 93 deletions(-)

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
deleted file mode 100644
index d8b06fc..0000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.6.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-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="~amd64 ~x86"
-fi
-IUSE="clutter packagekit raw"
-
-# FIXME: fix detection of docbook2man
-# 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}
-	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"
-
-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
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-tests
-		$(use_enable clutter)
-		$(use_enable packagekit)
-		$(use_enable raw exiv)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "If you want to do display or scanner calibration, you will need to"
-	elog "install media-gfx/argyllcms"
-}

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 d8b06fc..482da7e 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Color profile manager for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/gnome-color-manager/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -23,10 +23,10 @@ else
 fi
 IUSE="clutter packagekit raw"
 
-# FIXME: fix detection of docbook2man
 # 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
+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
@@ -43,7 +43,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.10:2
 		media-libs/clutter-gtk:1.0
 		media-libs/mash:0.2 )
 	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2 )"
+	raw? ( media-gfx/exiv2 )
+"
 RDEPEND="${COMMON_DEPEND}
 	media-gfx/shared-color-profiles"
 # docbook-sgml-{utils,dtd:4.1} needed to generate man pages
@@ -52,7 +53,8 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-utils
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -66,7 +68,6 @@ src_configure() {
 	# Always enable tests since they are check_PROGRAMS anyway
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-schemas-compile
 		--enable-tests
 		$(use_enable clutter)
 		$(use_enable packagekit)
@@ -78,6 +79,8 @@ src_configure() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
-	elog "If you want to do display or scanner calibration, you will need to"
-	elog "install media-gfx/argyllcms"
+	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
 }

diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
new file mode 100644
index 0000000..04b4090
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="clutter">Use <pkg>media-libs/clutter</pkg> to render color
+			gamut representations</flag>
+    <flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+  </use>
+</pkgmetadata>