Version bump, drop old
authorPacho Ramos <pacho@gentoo.org>
Sun, 25 Jan 2015 15:42:25 +0000 (15:42 +0000)
committerPacho Ramos <pacho@gentoo.org>
Sun, 25 Jan 2015 15:42:25 +0000 (15:42 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

x11-misc/colord/ChangeLog
x11-misc/colord/Manifest
x11-misc/colord/colord-1.2.1-r1.ebuild [deleted file]
x11-misc/colord/colord-1.2.4.ebuild [deleted file]
x11-misc/colord/colord-1.2.8.ebuild [new file with mode: 0644]
x11-misc/colord/metadata.xml

index 87faa7e40a23057bfc1bf36504ba10e426ff59cc..d982977259b8d48eea7fd87ddc45a441c0267150 100644 (file)
@@ -1,6 +1,12 @@
 # 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.92 2015/01/19 10:42:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.93 2015/01/25 15:42:24 pacho Exp $
+
+*colord-1.2.8 (25 Jan 2015)
+
+  25 Jan 2015; Pacho Ramos <pacho@gentoo.org> +colord-1.2.8.ebuild,
+  -colord-1.2.1-r1.ebuild, -colord-1.2.4.ebuild, metadata.xml:
+  Version bump, drop old
 
   19 Jan 2015; Jeroen Roovers <jer@gentoo.org> colord-1.2.5-r1.ebuild:
   Stable for HPPA (bug #536694).
index 6503db458ee88de5e69c1eb8b0b74b43bf16bf47..f9a74708c7c1f962f5548f4942769e14d35d2d29 100644 (file)
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST colord-1.2.1.tar.xz 1164544 SHA256 2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea SHA512 a0f6756f1f30a671ab723286cab445394c90013c5da6689786d91e28b6b272fa3cbb6afccf55af3b643890092187fc9ef0500a469ece8c16f7afc1b2b018ca03 WHIRLPOOL c3e00b89f4b8b720f2997e3b530b7b2db932c1cbeba98ce453c48e84f9768cade09f73a7fe9a8b1dbef0ed3f35362b652a535b09846b8b1eef53985e05467e5e
-DIST colord-1.2.4.tar.xz 1177272 SHA256 98440deb524f71894a3542cd84c1f10e9306092a908854227b1b065ea3274035 SHA512 44ff87d41be3cd1efb235d617198842685ce0392ffb6e727b7fcc0efecea863a5cbcc52e8acaf86a7dc85f0b0698dbced8ac484fa4566906fbc5fb070f7ee7af WHIRLPOOL 63a99326ff9555109b0245d4a0859fb5cd2ad7e290fe2f8dee4532147556843d4c013a17fb7cbe9fcca18294f57c381c58586cb6368a5aa03a245c7137891259
 DIST colord-1.2.5.tar.xz 1181220 SHA256 0332420c7fd808bb3a028e0249fb2b5e52b9544330c767d08b01a6e03d3c5283 SHA512 61a40856fff11361c94c2798e99dde6376a7f43bc3e67f1d7b83f7aaba872e08b4e8e25cacd8b54b1ac191b7bd33b08068e70e780e41e06bcab6bba8c7651805 WHIRLPOOL be40dd210d7de04763c12b0cf4a18b152b14d983e271fd3a15b9bf6320f7a542346c1c2e656bb4293ce4133a2fff14b0448df25882cd4f7e95187f43b22e1fc5
-EBUILD colord-1.2.1-r1.ebuild 3283 SHA256 a60aa2b91abc9166aa86b2ca35495e29014d5d3051ce1fb0ece6420c06bd727c SHA512 7abbcfad537aee8e65a02890f40b601854bd471ad281129555b2fa83cd7423c79c8dfc290ff762e510a16ab78bf6e20e6ace033161fbe0bc856aabaf94562a0b WHIRLPOOL 1771d403e72e6a9b6c2145dc943b0025e9b9336f2dde8794686e4a891d5af6cc2a18b830e0afa66f1d3f6e07e43492b38e839537f163069567c35f841eeed95e
-EBUILD colord-1.2.4.ebuild 3427 SHA256 58c93feb42d895ebcb3717e034091465caebde00c600bbd01cc609a556156523 SHA512 87ea11b0f2b421df09729dbddb0e5181163f23dac59da3f11d94d1837c1ce6d2bee4697ff653c608531f73c2a90f9996106c4f72aecdaf6f05bcc985eb812f2f WHIRLPOOL bb94a203ba1bdf87f13bb24c71f96d580c91eeb1ae7811b91e21965a3325a08384152e3dca5b01c96665fe137a5a4b0556eaec2d9f71724c67da4fb4bdb02a91
+DIST colord-1.2.8.tar.xz 1200732 SHA256 97c3cfdd91c256f2d7a69ead1ae0c1b13f013b14b1b1b41bf1e1243771db4afc SHA512 599be26dedf695612bfdd3c93a9e0d6250ec0bae25ce208917cb97d06b19491463de34a7586d1d1c2a4b8591e576901da12910d8e50a3e29e15e3b77c637bc1e WHIRLPOOL 4a3a7dd90f10e8e38529124e057ee873cb05800e7d43e4f2e8abfaa757dac59a067b862d20ad01df9db96487df8dc58464166a166cef104ec13ea692d0da37f0
 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
-MISC ChangeLog 14902 SHA256 ef8237853752d431209c74fa9f066154ea781e3de5dce348503c36fa01bda174 SHA512 446ed03d69173622b2e80846fa6e86c77f87ef8138e2139a212874b30b1dbe2605a0de56bce36fea67bfafaeac89b99c1b89d11c52b817c2a9da9bec9c3564b1 WHIRLPOOL c2401325e21d5e3548c0e9d537787b3dd452ffb2d93941ea308514840ab8f768c53f75620e82a1709f1ad609cbb46e79c15aae1a83a187ebb8c652d5ccf0f10a
-MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
+EBUILD colord-1.2.8.ebuild 4520 SHA256 53b96b23d8331e2a410af5ac0d49b2aae43729f1285c7e956ae34ae9aeb8f633 SHA512 8b9456de87a1d93cf1e5491ad545a3fcfb9d1d381242916d73854bf3e145e61ab9b26c704aa33f448cc0ff21198f76eaf246cf6b37c263c3543f11affbaf9dc4 WHIRLPOOL b52cd2ee909ba0e08657251cfa2335dfe9ac09ac49e2d16dcbb6f506faa2b3c697d668f54614b52b225bdcfb3b3cae0d57d4dde3e82e0d85be6410f18b6f8299
+MISC ChangeLog 15090 SHA256 f600ea4756c368d71485aa5839b8c155ce4c9707e3d8355bbfbee5f80683fe68 SHA512 fabcdf65d2e8b5e9585a8fce829a4db68ff966992101aab80904dc4ac66614ba535bded42d695a92076cc6f455537bea1fbf2178081f419c9c8fd26f9bcab805 WHIRLPOOL 3982678cc9ee8540ad6bdc944374873e204a63562d73d77c089fcb79b07196236b75aed5c590af145b88a0229f2c53ef554264e17191d327b42a200b44af8e7b
+MISC metadata.xml 469 SHA256 a36a9a3cb4c04c78da19f50b10a9222e6f56b0488e5dde38849a94466992924b SHA512 2e9539600b4d8071a240ea6163981673891adfceb377d449262a7c9d70bd0f9753a19b5b5cb119b6d068e2144cb425b61112fccb8823b0f19091e7ebc456f853 WHIRLPOOL ec5ca6e8fa9f9c78000c666f71dcf34af02d8961d3064da9262e9c6886867bf93490fda36ec9c3c6d35eed62349d4cce6fb4f4dd5577e04ace056640f7e70917
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS835QACgkQVWmRsqeSphMaigCfZa2Qc9mdbs/moW4ycoN1tWH0
-PXEAniBltwehUukTY4oB3RSiDMsQX+Yk
-=bF9x
+iEYEAREIAAYFAlTFDuEACgkQCaWpQKGI+9SMFQCfXUc0BYrPa+VQK6Y3cxoNAge5
+Z44An1APBFeG1Uv6vCE9FX8j6hX7s8jo
+=s/HF
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.1-r1.ebuild b/x11-misc/colord/colord-1.2.1-r1.ebuild
deleted file mode 100644 (file)
index feb8e77..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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.2.1-r1.ebuild,v 1.4 2014/08/14 12:40:38 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 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
-       >=media-libs/lcms-2.5:2=
-       gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] )
-       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:=
-               )
-"
-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
-       gnome2_src_prepare
-}
-
-src_configure() {
-       # Reverse tools require gusb
-       # bash-completion test does not work on gentoo
-       gnome2_src_configure \
-               --disable-bash-completion \
-               --disable-examples \
-               --disable-static \
-               --enable-libcolordcompat \
-               --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 policykit polkit) \
-               $(use_enable scanner sane) \
-               $(use_enable systemd systemd-login) \
-               $(use_enable udev) \
-               --with-udevrulesdir="$(get_udevdir)"/rules.d \
-               $(use_enable vala) \
-               "$(systemd_with_unitdir)"
-}
-
-src_install() {
-       DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-       gnome2_src_install
-
-       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
-}
diff --git a/x11-misc/colord/colord-1.2.4.ebuild b/x11-misc/colord/colord-1.2.4.ebuild
deleted file mode 100644 (file)
index c39998c..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.2.4.ebuild,v 1.1 2014/10/14 08:37:24 pacho 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 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
-       >=media-libs/lcms-2.6:2=
-       gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] )
-       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:=
-               )
-"
-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
-       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
-}
-
-src_configure() {
-       # Reverse tools require gusb
-       # bash-completion test does not work on gentoo
-       gnome2_src_configure \
-               --disable-bash-completion \
-               --disable-examples \
-               --disable-static \
-               --enable-libcolordcompat \
-               --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 policykit polkit) \
-               $(use_enable scanner sane) \
-               $(use_enable systemd systemd-login) \
-               $(use_enable udev) \
-               --with-udevrulesdir="$(get_udevdir)"/rules.d \
-               $(use_enable vala) \
-               "$(systemd_with_unitdir)"
-}
-
-src_install() {
-       DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-       gnome2_src_install
-
-       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
-}
diff --git a/x11-misc/colord/colord-1.2.8.ebuild b/x11-misc/colord/colord-1.2.8.ebuild
new file mode 100644 (file)
index 0000000..debf126
--- /dev/null
@@ -0,0 +1,169 @@
+# 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.1 2015/01/25 15:42:24 pacho 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="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 || 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 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 5954305aab6b501a5ef3df7f3f83836961e3c66c..419ce98485227f410389be48bb8cd5b815fce736 100644 (file)
@@ -3,10 +3,10 @@
 <pkgmetadata>
        <herd>gnome</herd>
        <use>
+               <flag name="argyllcms">Enable ArgyllCMS sensor</flag>
                <flag name="extra-print-profiles">Generate extra print profiles.
                        Warning: significant build time and memory requirements.</flag>
                <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
                        colorimeter drivers</flag>
-               <flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
        </use>
 </pkgmetadata>