Version bump, make polkit optional (#448058)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 127 insertions, 5 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 9b64d58c0c4a..e4768d58c21a 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.74 2014/04/27 09:48:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.75 2014/06/17 08:32:56 pacho Exp $
+
+*colord-1.2.1 (17 Jun 2014)
+
+  17 Jun 2014; Pacho Ramos <pacho@gentoo.org> +colord-1.2.1.ebuild:
+  Version bump, make polkit optional (#448058)
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -colord-0.1.28.ebuild:
   drop old
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 907a8ce143ac..be1dcf8eed3f 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX colord-0.1.26-fix-automagic-systemd.patch 1615 SHA256 dc1d206b3908b3c3a3b7e45c5fcf49ac82093ef0d1d2d9e62321d5e85a7662ba SHA512 636cd8de6c84f59fb31d82479acc63a99fa1e61dddd61dccb8029ecd64ab492472b319fbdb33cd2b30bbbd7d6f4a1efca03e5746e8974b63d94add21282b5c80 WHIRLPOOL 85f6483cde491ccbd23944f18947c73100751c074b37132bf008c0a1e65367bf83ecd2059a7332e69ad38284d67408c549fcaa1b7905a750b3a081119dc16bef
 DIST colord-1.0.3.tar.xz 1082868 SHA256 b4292ad5640135a2a1b773bffe0d94bc83abccc72c7fc8cf6407e7e7b25286d7 SHA512 9f187897411a67760738817414be028e4b188e102d3cd5a11c2082b92bb8b45b5875d3c385a9bdc954853406e431dafc0d7f8af184656ad934e3e7f650f9aa2e WHIRLPOOL dcee5d0bd63bee191bc9cc384f3fc0979009ee765a3c5bb8e1c1e43bc763ef8a55dc9eb6248e91b9f5d2857aa0db1aa3cd0f59bf38e76671ffd60c3ef32b3fc1
 DIST colord-1.2.0.tar.xz 1155920 SHA256 decbad07f7dbdebabe552f3280582008511f46201b47e0a91ea266d54072155e SHA512 8a486d7caa711ac7ac306f6acef66968245c97a01ae903dc753295d8ef385954dca67d6fd850c68a80430742a291ddc64daca2ce136f598b4a6b3baaae7d8c4c WHIRLPOOL a1e80dbc131bfb96258231c4a479d31f42496a2b9f59220fc3bde5c77743f45b65083006bcbc10f594d8ee47a262a724af87abbf31e17c2cd68b22510fe0b5b1
+DIST colord-1.2.1.tar.xz 1164544 SHA256 2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea SHA512 a0f6756f1f30a671ab723286cab445394c90013c5da6689786d91e28b6b272fa3cbb6afccf55af3b643890092187fc9ef0500a469ece8c16f7afc1b2b018ca03 WHIRLPOOL c3e00b89f4b8b720f2997e3b530b7b2db932c1cbeba98ce453c48e84f9768cade09f73a7fe9a8b1dbef0ed3f35362b652a535b09846b8b1eef53985e05467e5e
 EBUILD colord-1.0.3.ebuild 3122 SHA256 0271dd86cc2c9d4ca1fc6ad33290ae83018520dcb19be6e3c0d6f3265664e36b SHA512 2b96aa39b1410849a2240b9941e548f38490c3b52871c7027eddf4fc0ca03bd738bd33a62894a053e3aaf65c7d6301c56fe5395b28f61878ba88bd7b036a91ce WHIRLPOOL 25fcba26a594a6e4184059deeecfbfce2c82927e0d75837dae0a77e6a25e4ead64975c6e5120dd54ce5e6848ec35c766b660ede72c906417c1914df4824e5e16
 EBUILD colord-1.2.0.ebuild 3114 SHA256 9863234ad4cda857e2467ac9b9d608b50a3866964137069b9c0cc743ff6de108 SHA512 5be475b32c516de63930b4a5703bbfdc50427f0eff40bfaed3a37d03879a1006315664f26500a226015e92278148674944da5b15cb6bd03bf0199e97059c28b5 WHIRLPOOL 42edba8a7142f7cb48329e938b9053bc0bb312a7dfb1b7324c39896cb73939a49922614afc43d0856ca7f4b24a13b41c388d142e70c0d3f97464019ca08194be
-MISC ChangeLog 12252 SHA256 e5e0061e7889122961ce43b20a7ad9fb89644999d44a8439d453055e1f414771 SHA512 2e5205feaf12249e546805252b11c3e635379f2788a726b328b74bc190442b184f01094fc0709951fbe026e212a34c5dd5e872792af82860ca54dac550426f76 WHIRLPOOL dda393555579dd90da43ec04256b626efa0f53710854002debadbe1bfb6b4d60cd0b980a3afa44c6a4767aa0ead3530e1ef3b987d24a2ddd3ed060b9c2487dbc
+EBUILD colord-1.2.1.ebuild 3248 SHA256 b05743e0a9ded140ecb70b6bd948f6ea19d4cd750fdd4845bcdcce2d5e7b35be SHA512 33e3e9f88f8b95a7633eeb36a9b2dd4ce642dd0d367f0b2f2e817ca6293a353c12364d1a56f633102576d655795b9cc6afcea8cb3d1b356a00f38d7cfb1dfe6d WHIRLPOOL c095103906c2a00402e1bedb2e9aab9cdd333516fa1eab726928deabf0d0a7229c9b20519d66fb495e832387c977dfaf99a709420fb7e371853aa65415997618
+MISC ChangeLog 12397 SHA256 da2c3dbfbae93e9c39f9e1da693a4b1483a00d05b9a9c7fb00de44d4b113ffaa SHA512 864ff0319512929ae2a57ac6a32ad7cdafd4610a859316f86bed64f120c87759a023e7d55b5a1b56a5b67a97aca51160e0fe50b3662d9453d65e6562bcc90878 WHIRLPOOL 9bbd4068ec71edf648aae1169932d89d2a22466867c72fcaec31f544d3d6af76cb041d4b4b59062547b5279734c278a4e70a5b38b71d571dd4cb5b2cb5ab03f3
 MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNc0nMACgkQCaWpQKGI+9StzACfa/IN3gxeNW7S4GpsY7vDV9Ap
-Ev0An1cNON9suxzeZpsx1wisIyWexs5n
-=C0ko
+iEYEAREIAAYFAlOf/ToACgkQCaWpQKGI+9Q7FgCePSFkefUmf3W86tb2zJEJNi9T
+UZ8An1RDyuKQ5kB7goZf3T2S2HXiY1s/
+=pkR9
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.1.ebuild b/x11-misc/colord/colord-1.2.1.ebuild
new file mode 100644
index 000000000000..a38f0bf58c7f
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.1.ebuild
@@ -0,0 +1,115 @@
+# 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.ebuild,v 1.1 2014/06/17 08:32:56 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 ~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:=[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
+	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="$(udev_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
+}