Fix multilib build when USE=-gusb (bug #544968, thanks to Dell'Aica Valentino). Drop...
authorAlexandre Rostovtsev <tetromino@gentoo.org>
Sun, 29 Mar 2015 18:19:35 +0000 (18:19 +0000)
committerAlexandre Rostovtsev <tetromino@gentoo.org>
Sun, 29 Mar 2015 18:19:35 +0000 (18:19 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

x11-misc/colord/ChangeLog
x11-misc/colord/Manifest
x11-misc/colord/colord-1.2.5-r1.ebuild [deleted file]
x11-misc/colord/colord-1.2.8.ebuild [deleted file]
x11-misc/colord/colord-1.2.9.ebuild

index c022b65c8f4320f9acfe2b926d9d3f61ad0ea1fe..21553991acc0ca41465f49bc97480611b65d176d 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.98 2015/03/29 11:19:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.99 2015/03/29 18:19:23 tetromino Exp $
+
+  29 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -colord-1.2.5-r1.ebuild, -colord-1.2.8.ebuild, colord-1.2.9.ebuild:
+  Fix multilib build when USE=-gusb (bug #544968, thanks to Dell'Aica
+  Valentino). Drop old.
 
   29 Mar 2015; Jeroen Roovers <jer@gentoo.org> colord-1.2.9.ebuild:
   Stable for HPPA (bug #534012).
index 06d53ff1603d41c3b93d2cb2e5e39734285ec9de..2326ca9fdad7f42c46a0d41a91c4ae93b27ed243 100644 (file)
@@ -2,18 +2,27 @@
 Hash: SHA256
 
 DIST colord-1.2.5.tar.xz 1181220 SHA256 0332420c7fd808bb3a028e0249fb2b5e52b9544330c767d08b01a6e03d3c5283 SHA512 61a40856fff11361c94c2798e99dde6376a7f43bc3e67f1d7b83f7aaba872e08b4e8e25cacd8b54b1ac191b7bd33b08068e70e780e41e06bcab6bba8c7651805 WHIRLPOOL be40dd210d7de04763c12b0cf4a18b152b14d983e271fd3a15b9bf6320f7a542346c1c2e656bb4293ce4133a2fff14b0448df25882cd4f7e95187f43b22e1fc5
-DIST colord-1.2.8.tar.xz 1200732 SHA256 97c3cfdd91c256f2d7a69ead1ae0c1b13f013b14b1b1b41bf1e1243771db4afc SHA512 599be26dedf695612bfdd3c93a9e0d6250ec0bae25ce208917cb97d06b19491463de34a7586d1d1c2a4b8591e576901da12910d8e50a3e29e15e3b77c637bc1e WHIRLPOOL 4a3a7dd90f10e8e38529124e057ee873cb05800e7d43e4f2e8abfaa757dac59a067b862d20ad01df9db96487df8dc58464166a166cef104ec13ea692d0da37f0
 DIST colord-1.2.9.tar.xz 1200936 SHA256 48ce0db4f327c94c2bec11fed98a9a73f580d34c6edcd636d90831fe3bea5ae4 SHA512 d25497fa6460e5ffd7ce872bf16b60916e879cdd3aaec4c81dd4ab8446949767f3d3d49a3e654813445b049a9653334ba22d8e9a91cf6699c6063c01be382a75 WHIRLPOOL ca8edc19b162e4e97c263c1bc64d2a655d5adafeb2cb64c8bdbd7eb4e20052ce76f8ad332168088a97e654d20f0c5215d62829fed7471ac69faed3a79fc9f283
-EBUILD colord-1.2.5-r1.ebuild 4397 SHA256 8f120d985b29f60310aaed7360713097620d4433fbc2120d084ea21e561e52c2 SHA512 764c7e9cab92a74c2910b0fa79b5d7644835db2345d122f1f3d262c61c8221518a5f82c5f2882ff9ed29a0b09569fca882c701053f1b780828992d8b46b65264 WHIRLPOOL 0c23b8af0e980dfdc75454e302fad65bd34e8406e4f3dea74a40c33d1321aa78ec7f6cac21d4905ce7541f1786f0f4379afd318ff9e7da919d59f984561e1930
 EBUILD colord-1.2.5.ebuild 3424 SHA256 5cd8c14ac5bc0ed63ae64c756f94c75e7b860067526a56b22b5dc447cebcbfdf SHA512 593e246b123e4a7f36bf062f31e54dec9af7d4105554e148e105747d3b24b71ef8f2ba4cdfb39216dd47af3351a10983e7e9a1d2c8fa9f0018e73afc2be91bd4 WHIRLPOOL 151b4f82c83ca623552fb3f61b5703802de4b68c37cbc40f2bd8fa8bcfb8bb16b5dc9627c7bcd2abe68c90c4a04568aadd9c1a149950666a1744eef61314f87b
-EBUILD colord-1.2.8.ebuild 4564 SHA256 b990aab99d934ff06d73699de6ec08ba9653cd80828e234a9d3a8797fb2ff7ec SHA512 9d7df153895a19f0392f525ee7780947d5a612b38746d4ca899339ff4f5e31ecc8c5ec90c9e5ee0b4762d9d924e7dea00a3aa33b67c3c26c6b6da1e7c8b14d8c WHIRLPOOL 836f74378a6822604c5b0c06d69f57e75983246952c4b821fdfaac9d4e9a4fc3844f5beb109035ab75b6c7b5ca1e5b00edf768f23a5542e1981a65fdcd7c4435
-EBUILD colord-1.2.9.ebuild 4559 SHA256 3997de020adf57ed0aad196be09292cb48f212c7769e3ad7c500bc39d87e94ac SHA512 5bc8e855794b6e9da3013ca9c1e30b13fb0be59beae0ceb220a9ba66ca272a472ddd33ce8262fb4d3a9b275e14f5f235adec0c152b51d7bd3e627c700ea02507 WHIRLPOOL 447602a76798cafc2bd95f3e4387415da90e5139182909bf81dbb68a27871d8c6990f0c35c6a5b3e5e61cee508a812fdd8ec663e634edae4f6553335423afe43
-MISC ChangeLog 15611 SHA256 ebb59371529fc287eed694f2344b2fc0eb93613eb283f4ed2ed4a0dfc1519fc5 SHA512 5c8fffa24cc93252e4f380430e507a9e9279a9a6faff7a64ad09750775e59da344747484d384939da97afcfbf10721e3bee628cf8c12fd710b8c85b117b75be1 WHIRLPOOL 109e7ce69cf08380fc89a9a8e801fb5ff37f9617c68c4514ee62acc7016924f1eb8832bf0d80fd7640d29a9182a8c93032bdc54c28149e17ffd332e88f5115b9
+EBUILD colord-1.2.9.ebuild 4601 SHA256 b7e531259edde09be4880ffc6e03c4d4d3a070ac0a67182571a8680b961a8e93 SHA512 32a22d34bc3eadee2cd2b9d4040e701919c2ba3bf445f3a5eff2885ac39d8e57a77656ff7dcdbbfd5f69f6725418571bf31cd80f6d3f10e90b98fb502d50a1b9 WHIRLPOOL f4ebdb3c34d1b8f642343d6e0fbc96c4523bdf26700a7694ea98a79d159771497f12df0743d96e20e858d6edb63e43a2f44c26f72ab429a556c399bc03538eff
+MISC ChangeLog 15841 SHA256 7285f59bda970f5dcc60840c882b71047489a2ea293d6a420db4f72f4f45e386 SHA512 c7beb6a11283152ad4b6ad90f9e0fa029dc5a07eadde31920c8285ceb86328d903f411c3da0d02e35cc9f86d34f151abde94728bf4a0484f0c2b8c38720a0fa2 WHIRLPOOL 21debc6092153a56e912a38678747fea1e3ae1739a860f68ebcfb287a25e9892cca09d675f5102e7ac985e4497c30d517125c818f473febabd3361bd38df929a
 MISC metadata.xml 469 SHA256 a36a9a3cb4c04c78da19f50b10a9222e6f56b0488e5dde38849a94466992924b SHA512 2e9539600b4d8071a240ea6163981673891adfceb377d449262a7c9d70bd0f9753a19b5b5cb119b6d068e2144cb425b61112fccb8823b0f19091e7ebc456f853 WHIRLPOOL ec5ca6e8fa9f9c78000c666f71dcf34af02d8961d3064da9262e9c6886867bf93490fda36ec9c3c6d35eed62349d4cce6fb4f4dd5577e04ace056640f7e70917
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUX394ACgkQVWmRsqeSphMdkgCfRnCO0ArORASNDnB1RaRi2NRY
-iCoAmwQ4v17ebIG+WGX22NbVbg+Nw2d5
-=DmGO
+iQJ8BAEBCABmBQJVGEIvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNtewP/3TpZw3dS2J0O27U+28xp7b9
+zrgpArDuWDSGYZZSUAbJ2botSd+G1DY8f8yhwsQrAxYQJlasHcZc++y9zK7V8bbE
+EFjKGWQHfPzwZHYhB0AtklSiOE+QZQ4DDVsC1qLlIHcdE51Yvf3GOi+ibFIstttN
+94pNj+nwbnK5NBbUaTiB9Z7wv2jgqnIkhuxIeIDHITXLXfW6lobdaZtxVibl3vsd
+Ot/Sa4HEIF5oNuvwm+Y+7FHsegv0VGnEPgC79OGHVe2RdLhl137bGo3Mj2l/+5NA
+84odVp6nHQD+PKDScdN1cG6xxqPvS7z58+5NJFbrGF2EMs6JE+9V0UpIH2ltKf7L
+1Q9yMtjtgHnDWDvXX4pjt6c/Sh5amuQwKCi7F/TLSYQAU2yKjFqSnWyqRU4WEaki
+LciQnskyNZKEPZe51XBLZemkvvdlvCkMOfDQv3FPIuu71gIwNMWZYDSR+dclj0qZ
+xU0gzTwSkvopoxnb9A4aSON1C6ZZA0A0QbYzyZQnKu48LPfzwiAq/jyIUolCJi4x
+/M/5n+mctBOWgklhUqr5gFX+4GA9GYRJCUXRoH/eqA4Ji2iiO0lmzSKWIff6nzYt
+Te/oPgKHXxTfoPEO4ILeuBUdQSfsd9xsCTWVmS90bC1h7HQiusS37CUnAaOPOHDp
+K/AfUQ8oHBxjv/BxqCy/
+=XBpy
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.5-r1.ebuild b/x11-misc/colord/colord-1.2.5-r1.ebuild
deleted file mode 100644 (file)
index 7eeccba..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.5-r1.ebuild,v 1.2 2015/01/19 10:42:27 jer Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-inherit bash-completion-r1 check-reqs eutils gnome2 multilib-minimal user systemd 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/2" # subslot = libcolord soname version
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
-       gusb? ( udev )
-       scanner? ( udev )
-       vala? ( introspection )
-"
-
-COMMON_DEPEND="
-       dev-db/sqlite:3=
-       >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-       >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-       gusb? ( >=dev-libs/libgusb-0.1.1[introspection?,${MULTILIB_USEDEP}] )
-       introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-       policykit? ( >=sys-auth/polkit-0.103 )
-       scanner? ( media-gfx/sane-backends )
-       systemd? ( >=sys-apps/systemd-44:0= )
-       udev? (
-               virtual/udev
-               virtual/libgudev:=
-               virtual/libudev:=[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       !media-gfx/shared-color-profiles
-       !<=media-gfx/colorhug-client-0.1.13
-"
-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[${MULTILIB_USEDEP}]
-       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() {
-       # Adapt to Gentoo paths
-       sed -i -e 's/spotread/argyll-spotread/' src/sensors/cd-sensor-argyll.c || die
-
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-multilib_src_configure() {
-       # Reverse tools require gusb
-       # bash-completion test does not work on gentoo
-       local myconf=(
-               --disable-bash-completion
-               --disable-examples
-               --disable-static
-               --enable-libcolordcompat
-               --with-daemon-user=colord
-               --localstatedir="${EPREFIX}"/var
-               $(multilib_native_use_enable extra-print-profiles print-profiles)
-               $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
-               $(use_enable gusb)
-               $(multilib_native_use_enable gusb reverse)
-               $(multilib_native_use_enable introspection)
-               $(multilib_native_use_enable policykit polkit)
-               $(multilib_native_use_enable scanner sane)
-               $(multilib_native_use_enable systemd systemd-login)
-               $(use_enable udev)
-               --with-udevrulesdir="$(get_udevdir)"/rules.d
-               $(multilib_native_use_enable vala)
-               "$(systemd_with_unitdir)"
-       )
-
-       if ! multilib_is_native_abi; then
-               # disable some extraneous checks
-               myconf+=(
-                       SQLITE_{CFLAGS,LIBS}=' '
-                       GUDEV_{CFLAGS,LIBS}=' '
-               )
-       fi
-
-       ECONF_SOURCE=${S} \
-       gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               gnome2_src_compile
-       else
-               emake -C lib/colord
-               emake -C lib/colorhug
-               emake -C lib/compat
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi; then
-               default
-       else
-               emake -C lib/colord check
-               emake -C lib/colorhug check
-               emake -C lib/compat check
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               gnome2_src_install
-       else
-               gnome2_src_install -C lib/colord
-               gnome2_src_install -C lib/colorhug
-               gnome2_src_install -C lib/compat
-               gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
-       fi
-}
-
-multilib_src_install_all() {
-       DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-       einstalldocs
-
-       newbashcomp data/colormgr colormgr
-
-       # 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
-               docinto examples
-               dodoc examples/*.c
-       fi
-}
diff --git a/x11-misc/colord/colord-1.2.8.ebuild b/x11-misc/colord/colord-1.2.8.ebuild
deleted file mode 100644 (file)
index aa03b4c..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.8.ebuild,v 1.2 2015/02/03 11:58:04 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-inherit autotools bash-completion-r1 check-reqs eutils gnome2 multilib-minimal user systemd 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/2" # subslot = libcolord soname version
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We prefer policykit enabled by default, bug #448058
-IUSE="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
-REQUIRED_USE="
-       gusb? ( udev )
-       scanner? ( udev )
-       vala? ( introspection )
-"
-
-COMMON_DEPEND="
-       dev-db/sqlite:3=
-       >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-       >=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
-       argyllcms? ( media-gfx/argyllcms )
-       gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
-       introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-       policykit? ( >=sys-auth/polkit-0.103 )
-       scanner? (
-               media-gfx/sane-backends
-               sys-apps/dbus )
-       systemd? ( >=sys-apps/systemd-44:0= )
-       udev? (
-               virtual/udev
-               virtual/libgudev:=
-               virtual/libudev:=[${MULTILIB_USEDEP}]
-       )
-"
-RDEPEND="${COMMON_DEPEND}
-       !media-gfx/shared-color-profiles
-       !<=media-gfx/colorhug-client-0.1.13
-"
-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[${MULTILIB_USEDEP}]
-       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() {
-       # Adapt to Gentoo paths
-       sed -i -e 's/spotread/argyll-spotread/' \
-               src/sensors/cd-sensor-argyll.c \
-               configure.ac || die
-
-       eautoreconf
-       use vala && vala_src_prepare
-       gnome2_src_prepare
-}
-
-multilib_src_configure() {
-       # Reverse tools require gusb
-       # bash-completion test does not work on gentoo
-       local myconf=(
-               --disable-bash-completion
-               --disable-examples
-               --disable-static
-               --enable-libcolordcompat
-               --with-daemon-user=colord
-               --localstatedir="${EPREFIX}"/var
-               $(multilib_native_use_enable argyllcms argyllcms-sensor)
-               $(multilib_native_use_enable extra-print-profiles print-profiles)
-               $(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
-               $(use_enable gusb)
-               $(multilib_native_use_enable gusb reverse)
-               $(multilib_native_use_enable introspection)
-               $(multilib_native_use_enable policykit polkit)
-               $(multilib_native_use_enable scanner sane)
-               $(multilib_native_use_enable systemd systemd-login)
-               $(use_enable udev)
-               --with-udevrulesdir="$(get_udevdir)"/rules.d
-               $(multilib_native_use_enable vala)
-               "$(systemd_with_unitdir)"
-       )
-
-       if ! multilib_is_native_abi; then
-               # disable some extraneous checks
-               myconf+=(
-                       SQLITE_{CFLAGS,LIBS}=' '
-                       GUDEV_{CFLAGS,LIBS}=' '
-               )
-       fi
-
-       ECONF_SOURCE=${S} \
-       gnome2_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-       if multilib_is_native_abi; then
-               gnome2_src_compile
-       else
-               emake -C lib/colord
-               emake -C lib/colorhug
-               emake -C lib/compat
-       fi
-}
-
-multilib_src_test() {
-       if multilib_is_native_abi; then
-               default
-       else
-               emake -C lib/colord check
-               emake -C lib/colorhug check
-               emake -C lib/compat check
-       fi
-}
-
-multilib_src_install() {
-       if multilib_is_native_abi; then
-               gnome2_src_install
-       else
-               gnome2_src_install -C lib/colord
-               gnome2_src_install -C lib/colorhug
-               gnome2_src_install -C lib/compat
-               gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
-       fi
-}
-
-multilib_src_install_all() {
-       DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-       einstalldocs
-
-       newbashcomp data/colormgr colormgr
-
-       # 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
-               docinto examples
-               dodoc examples/*.c
-       fi
-}
index 78803f2e846564630382a3d8e0f24a49e5aabccf..4da838cb9172cd5ee081d96196dd287053bb4a07 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild,v 1.4 2015/03/29 11:19:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.9.ebuild,v 1.5 2015/03/29 18:19:23 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -128,7 +128,7 @@ multilib_src_compile() {
                gnome2_src_compile
        else
                emake -C lib/colord
-               emake -C lib/colorhug
+               use gusb && emake -C lib/colorhug
                emake -C lib/compat
        fi
 }
@@ -138,7 +138,7 @@ multilib_src_test() {
                default
        else
                emake -C lib/colord check
-               emake -C lib/colorhug check
+               use gusb && emake -C lib/colorhug check
                emake -C lib/compat check
        fi
 }
@@ -148,7 +148,7 @@ multilib_src_install() {
                gnome2_src_install
        else
                gnome2_src_install -C lib/colord
-               gnome2_src_install -C lib/colorhug
+               use gusb && gnome2_src_install -C lib/colorhug
                gnome2_src_install -C lib/compat
                gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
        fi