[gentoo-commits] proj/gnome:master commit in: x11-misc/colord/

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

commit:     e3c655600a41017fdf179cc3ff6fb33a66ad1d67
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 23:42:49 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 23:42:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e3c65560

x11-misc/colord: sync with gentoo-x86

---
 x11-misc/colord/colord-9999.ebuild | 55 +++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index eac06ce..ec57608 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="5"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 check-reqs eutils user systemd base udev vala
+inherit bash-completion-r1 check-reqs eutils user systemd base udev vala
 if [[ ${PV} = 9999 ]]; then
 	GCONF_DEBUG="no"
 	inherit gnome2-live # need all the hacks from gnome2-live_src_prepare
@@ -22,41 +22,47 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = libcolord soname version
+IUSE="examples extra-print-profiles +gusb +introspection scanner systemd +udev vala"
+REQUIRED_USE="
+	gusb? ( udev )
+	scanner? ( udev )
+	vala? ( introspection )
+"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
+	IUSE="${IUSE} doc"
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
-IUSE="doc examples extra-print-profiles +gusb +introspection systemd +udev vala"
-REQUIRED_USE="vala? ( introspection )"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3=
-	>=dev-libs/glib-2.28.0:2
-	>=media-libs/lcms-2.2:2=
+	>=dev-libs/glib-2.32.0:2
+	>=media-libs/lcms-2.5:2=
 	>=sys-auth/polkit-0.103
-	gusb? ( >=dev-libs/libgusb-0.1.1 )
+	gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] )
 	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) )
 "
 if [[ ${PV} =~ 9999 ]]; then
 	# Needed for generating man pages, not needed for tarballs
 	DEPEND="${DEPEND}
-		>=dev-util/gtk-doc-am-1.9
-		app-text/docbook-sgml-utils"
+		app-text/docbook-sgml-utils
+		doc? (
+			app-text/docbook-xml-dtd:4.1.2
+			>=dev-util/gtk-doc-1.9 )"
 fi
 
 # FIXME: needs pre-installed dbus service files
@@ -78,41 +84,46 @@ pkg_setup() {
 
 src_prepare() {
 	use vala && vala_src_prepare
-
-	epatch "${FILESDIR}/${PN}-0.1.26-fix-automagic-systemd.patch"
-	eautoreconf
 }
 
 src_configure() {
+	local myconf=""
+	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 	# Reverse tools require gusb
+	# bash-completion test does not work on gentoo
 	econf \
+		--disable-bash-completion \
 		--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 systemd libsystemd-login) \
+		$(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)"
+		"$(systemd_with_unitdir)" \
+		${myconf}
 
-	# parallel make fails in doc/api
-	use doc && MAKEOPTS="${MAKEOPTS} -j1"
+	if [[ ${PV} = 9999 ]]; then
+		# parallel make fails in doc/api
+		use doc && MAKEOPTS="${MAKEOPTS} -j1"
+	fi
 }
 
 src_install() {
 	DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
 	default
 
-	newbashcomp client/colormgr-completion.bash colormgr
+	newbashcomp data/colormgr colormgr
 	rm -vr "${ED}etc/bash_completion.d"
 
 	# Ensure config and profile directories exist and /var/lib/colord/*