Add missing sane support, fix gtk-doc support per team policy, fix glib dependency.

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

2 files changed, 16 insertions, 13 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index b65ac7310354..30c8bfba47a6 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.62 2013/05/10 11:16:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.63 2013/06/30 20:19:31 eva Exp $
+
+  30 Jun 2013; Gilles Dartiguelongue <eva@gentoo.org> colord-0.1.31.ebuild:
+  Add missing sane support, fix gtk-doc support per team policy, fix glib
+  dependency.
 
   10 May 2013; Gilles Dartiguelongue <eva@gentoo.org> -colord-0.1.26.ebuild,
   -colord-0.1.26-r1.ebuild:
diff --git a/x11-misc/colord/colord-0.1.31.ebuild b/x11-misc/colord/colord-0.1.31.ebuild
index adea2672fefb..3bf6dbb481e7 100644
--- a/x11-misc/colord/colord-0.1.31.ebuild
+++ b/x11-misc/colord/colord-0.1.31.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/x11-misc/colord/colord-0.1.31.ebuild,v 1.1 2013/03/28 22:23:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.31.ebuild,v 1.2 2013/06/30 20:19:31 eva Exp $
 
 EAPI="5"
 VALA_MIN_API_VERSION="0.18"
@@ -15,28 +15,29 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = libcolord soname version
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc examples extra-print-profiles +gusb +introspection systemd +udev vala"
-REQUIRED_USE="vala? ( introspection )"
+IUSE="examples extra-print-profiles +gusb +introspection scanner systemd +udev vala"
+REQUIRED_USE="
+	scanner? ( udev )
+	vala? ( introspection )"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3=
-	>=dev-libs/glib-2.28.0:2
+	>=dev-libs/glib-2.32.0:2
 	>=media-libs/lcms-2.2:2=
 	>=sys-auth/polkit-0.103
 	gusb? ( >=dev-libs/libgusb-0.1.1 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+	scanner? ( media-gfx/sane-backends )
 	systemd? ( >=sys-apps/systemd-44 )
 	udev? ( virtual/udev:=[gudev] )"
 RDEPEND="${COMMON_DEPEND}
 	!media-gfx/shared-color-profiles"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1.9 )
 	extra-print-profiles? ( media-gfx/argyllcms )
 	vala? ( $(vala_depend) )"
 
@@ -65,25 +66,23 @@ src_configure() {
 	# Reverse tools require gusb
 	econf \
 		--disable-examples \
+		--disable-gtk-doc \
 		--disable-static \
-		--enable-polkit \
 		--disable-volume-search \
+		--enable-polkit \
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
-		$(use_enable doc gtk-doc) \
 		$(use_enable extra-print-profiles print-profiles) \
 		$(usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") \
 		$(use_enable gusb) \
 		$(use_enable gusb reverse) \
 		$(use_enable introspection) \
+		$(use_enable scanner sane) \
 		$(use_enable systemd systemd-login) \
 		$(use_enable udev gudev) \
 		--with-udevrulesdir="$(udev_get_udevdir)"/rules.d \
 		$(use_enable vala) \
 		"$(systemd_with_unitdir)"
-
-	# parallel make fails in doc/api
-	use doc && MAKEOPTS="${MAKEOPTS} -j1"
 }
 
 src_install() {