Version bump.

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

3 files changed, 121 insertions, 9 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 50ea02cf42c0..8480b8edb50a 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.72 2014/03/29 22:04:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.73 2014/04/25 23:21:35 eva Exp $
+
+*colord-1.2.0 (25 Apr 2014)
+
+  25 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +colord-1.2.0.ebuild:
+  Version bump.
 
   29 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   colord-0.1.28.ebuild, colord-1.0.3.ebuild:
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index af75daa697b2..6027faeb6c49 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -4,18 +4,16 @@ Hash: SHA256
 AUX colord-0.1.26-fix-automagic-systemd.patch 1615 SHA256 dc1d206b3908b3c3a3b7e45c5fcf49ac82093ef0d1d2d9e62321d5e85a7662ba SHA512 636cd8de6c84f59fb31d82479acc63a99fa1e61dddd61dccb8029ecd64ab492472b319fbdb33cd2b30bbbd7d6f4a1efca03e5746e8974b63d94add21282b5c80 WHIRLPOOL 85f6483cde491ccbd23944f18947c73100751c074b37132bf008c0a1e65367bf83ecd2059a7332e69ad38284d67408c549fcaa1b7905a750b3a081119dc16bef
 DIST colord-0.1.28.tar.xz 861072 SHA256 b165be944eb60aedb3e16d04336643dd9b4945d034c899473583b5a44b9cbcdd SHA512 4714cfea4024c1c7c9781884a9bdbdf3b20696055053ce6432371366520c44e80f96db0a85549524772965decfc71834704782b50cf7d6b5a446babd25b141d8 WHIRLPOOL e24d22c9e04c70e36c055ddd1b45416aea822d9aeb7ef950155a010bad810b16afea28e77d42e87e97da44089c3ece46303a4c01887c112b699da0641c050c50
 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
 EBUILD colord-0.1.28.ebuild 3164 SHA256 41ae03c84efc8e05058a065905ebafaeec165bc25187b6ff0661e71100e4f85e SHA512 08f5e8bbee054d51852db0ec870aa8c6f52e6ba98c6a92588d5598c974360cdbfa422ca46031cd93ae29f58a0f58913ff220de33869c335fce7b37b35964bf76 WHIRLPOOL 65582b00dc47652f024e458c9ea17fc7bd8685fc67a33493be70a138b6431822bf157c9ba69cd523b4af41a803b91af68819081367fd837ff32d2960d09ab78f
 EBUILD colord-1.0.3.ebuild 3122 SHA256 0271dd86cc2c9d4ca1fc6ad33290ae83018520dcb19be6e3c0d6f3265664e36b SHA512 2b96aa39b1410849a2240b9941e548f38490c3b52871c7027eddf4fc0ca03bd738bd33a62894a053e3aaf65c7d6301c56fe5395b28f61878ba88bd7b036a91ce WHIRLPOOL 25fcba26a594a6e4184059deeecfbfce2c82927e0d75837dae0a77e6a25e4ead64975c6e5120dd54ce5e6848ec35c766b660ede72c906417c1914df4824e5e16
-MISC ChangeLog 12053 SHA256 2bb54a2991e5f61100fae3db31613ff919e6541e393ce2aad4c64d1d840abfd4 SHA512 f1cf240ebbdde2e370cb3a7cc704d4d0debb3d70ae0a9bc4c762ce2f5c766a3193484fc916e37bb6101f6bdd0980b615d8cdc14e8cbb5547096d6c4c16fb9870 WHIRLPOOL 97420380e525ba54d8772c05d7f6041c846158e546df270f473010cfe9fd9857ed2b47cfd81c0fad998ab95c55ca24b452c34748fe7e7481f692053c1466aa48
+EBUILD colord-1.2.0.ebuild 3114 SHA256 9863234ad4cda857e2467ac9b9d608b50a3866964137069b9c0cc743ff6de108 SHA512 5be475b32c516de63930b4a5703bbfdc50427f0eff40bfaed3a37d03879a1006315664f26500a226015e92278148674944da5b15cb6bd03bf0199e97059c28b5 WHIRLPOOL 42edba8a7142f7cb48329e938b9053bc0bb312a7dfb1b7324c39896cb73939a49922614afc43d0856ca7f4b24a13b41c388d142e70c0d3f97464019ca08194be
+MISC ChangeLog 12169 SHA256 929d142c5260629d18487b68e0f1f928210e32b59328bcd056815f0aac1bf90c SHA512 5142e5971cc28272c345db81c0ce5e040d0e8cdfc49565acd225a9cffa63e620c834147a8de3d1c366373c1292d739e021f5367f29c27be01adc736adcb2ec28 WHIRLPOOL 8c64e91244f15ced43e212308adb62ce249d9800416648083ca00a96d8639f07b9e3ca6c5b81c7c98a1a61f776b16e981d4d0e575590d272929dcf88d2e64468
 MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTN0MkAAoJEJ0WA1zPCt1hs7MH/iF2dObbpeMeWFIAJXB5kAWQ
-zTtqTWwxXclGMb5JX+lBC9fxt+sln5G3CQNcQaSJC37V4aR0JjWFHcaEbOSqZ0Uq
-CdO48kt1Yy9fbj9RkMsLqXbtTjCPJlH8Pb5orYCanZi3gl+4euBvMLQBuDRHKWzx
-qWpMPYzT62zc8Bdn7fw/3xaseY8CBvGrs8z2x0aOurxYGRWdi9IHmKv47xT9OCxq
-wvSV7EkyKpOsSjVEip4t90E5UqZhHLUAJQRlsnb1Erj4c8TXHGLNHHBFyh4oz5DG
-drLtayrb/IbmQgodnoGUOI1L9rQ9iUWJ+ypC6WmmIH+GjRR9z5E1CRvpH37m2r8=
-=HVRF
+iEYEAREIAAYFAlNa7gAACgkQ1fmVwcYIWAbW1ACfVqDBrTLWCfxal1QIFP5Ll9nz
+7IUAn3KqTwtSEI2mHPm0Gpmz1cnn9yHx
+=7LJv
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.0.ebuild b/x11-misc/colord/colord-1.2.0.ebuild
new file mode 100644
index 000000000000..d136fc59ab4a
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.0.ebuild
@@ -0,0 +1,109 @@
+# 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.0.ebuild,v 1.1 2014/04/25 23:21:35 eva Exp $
+
+EAPI="5"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
+
+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/2" # 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.36:2
+	>=media-libs/lcms-2.5:2=
+	>=sys-auth/polkit-0.103
+	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: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
+}
+
+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 \
+		--enable-polkit \
+		--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 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)
+	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
+}