Fix dep on libusb introspection when needed (#497644 by Emile), drop old

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 9 insertions, 221 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index b1d77f9c7b1b..ec457a9c994c 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.68 2013/12/08 19:50:14 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.69 2014/01/10 20:46:44 pacho Exp $
+
+  10 Jan 2014; Pacho Ramos <pacho@gentoo.org> -colord-0.1.31.ebuild,
+  -colord-0.1.34.ebuild, colord-1.0.3.ebuild:
+  Fix dep on libusb introspection when needed (#497644 by Emile), drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> colord-1.0.3.ebuild:
   x86 stable, bug #478252
diff --git a/x11-misc/colord/colord-0.1.31.ebuild b/x11-misc/colord/colord-0.1.31.ebuild
deleted file mode 100644
index 714a6be4ae42..000000000000
--- a/x11-misc/colord/colord-0.1.31.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.3 2013/09/08 19:50:07 tetromino Exp $
-
-EAPI="5"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 check-reqs eutils user systemd base udev vala
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://www.freedesktop.org/software/colord/"
-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="examples extra-print-profiles +gusb +introspection scanner systemd +udev vala"
-REQUIRED_USE="
-	gusb? ( udev )
-	scanner? ( udev )
-	vala? ( introspection )"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3=
-	>=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
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Reverse tools require gusb
-	econf \
-		--disable-examples \
-		--disable-gtk-doc \
-		--disable-static \
-		--disable-volume-search \
-		--enable-polkit \
-		--with-daemon-user=colord \
-		--localstatedir="${EPREFIX}"/var \
-		$(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)"
-}
-
-src_install() {
-	DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
-	default
-
-	newbashcomp client/colormgr-completion.bash colormgr
-	rm -vr "${ED}etc/bash_completion.d"
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files --modules
-}
diff --git a/x11-misc/colord/colord-0.1.34.ebuild b/x11-misc/colord/colord-0.1.34.ebuild
deleted file mode 100644
index d1686b51c2cf..000000000000
--- a/x11-misc/colord/colord-0.1.34.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.34.ebuild,v 1.2 2013/09/08 19:50:07 tetromino Exp $
-
-EAPI="5"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit bash-completion-r1 check-reqs eutils user systemd base udev vala
-
-DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://www.freedesktop.org/software/colord/"
-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="examples extra-print-profiles +gusb +introspection scanner systemd +udev vala"
-REQUIRED_USE="
-	gusb? ( udev )
-	scanner? ( udev )
-	vala? ( introspection )"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3=
-	>=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
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# According to upstream comment in colord.spec.in, building the extra print
-# profiles requires >=4G of memory
-CHECKREQS_MEMORY="4G"
-
-pkg_pretend() {
-	use extra-print-profiles && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use extra-print-profiles && check-reqs_pkg_setup
-	enewgroup colord
-	enewuser colord -1 -1 /var/lib/colord colord
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Reverse tools require gusb
-	# bash-completion test does not work on gentoo
-	econf \
-		--disable-bash-completion \
-		--disable-examples \
-		--disable-gtk-doc \
-		--disable-static \
-		--disable-volume-search \
-		--enable-polkit \
-		--with-daemon-user=colord \
-		--localstatedir="${EPREFIX}"/var \
-		$(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)"
-}
-
-src_install() {
-	DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
-	default
-
-	newbashcomp data/colormgr colormgr
-	rm -vr "${ED}etc/bash_completion.d"
-
-	# Ensure config and profile directories exist and /var/lib/colord/*
-	# is writable by colord user
-	keepdir /var/lib/color{,d}/icc
-	fowners colord:colord /var/lib/colord{,/icc}
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	prune_libtool_files --modules
-}
diff --git a/x11-misc/colord/colord-1.0.3.ebuild b/x11-misc/colord/colord-1.0.3.ebuild
index 1ebad11ad0e4..8ab7ba01fb6a 100644
--- a/x11-misc/colord/colord-1.0.3.ebuild
+++ b/x11-misc/colord/colord-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.0.3.ebuild,v 1.4 2013/12/08 19:50:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.0.3.ebuild,v 1.5 2014/01/10 20:46:44 pacho Exp $
 
 EAPI="5"
 VALA_MIN_API_VERSION="0.18"
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	>=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 )