Version bump

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

3 files changed, 183 insertions, 15 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 9af1cac1bd2b..10c2ce22b21b 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -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.102 2015/06/26 09:24:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.103 2015/07/05 08:43:40 pacho Exp $
+
+*colord-1.2.11 (05 Jul 2015)
+
+  05 Jul 2015; Pacho Ramos <pacho@gentoo.org> +colord-1.2.11.ebuild:
+  Version bump
 
   26 Jun 2015; Agostino Sarubbo <ago@gentoo.org> colord-1.2.10.ebuild:
   Stable for x86, wrt bug #551814
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 30a2ff9d92e8..a7ef4b04b171 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -2,25 +2,17 @@
 Hash: SHA256
 
 DIST colord-1.2.10.tar.xz 1203248 SHA256 1dea0453cc778326e700f6cb0a206836a57dedfb0fbdc3acaf2be02ea77a963a SHA512 fdf6f41e84fb37905e3c2e37a7d095d5271759f17e292cf5cf23f846ea6805949185c1a0548c4c4e24e2a385e655cd30609423921b0389076f5373ca1b8578e7 WHIRLPOOL d70fd0d3fde030f6c592f49ae146ccbb38c00ad0c28e2253ea8e2e00436c19fc4cf53aead6360e04eb7509a8d94bd07ffab6dde5592fd050dd37de3355b76f87
+DIST colord-1.2.11.tar.xz 1205468 SHA256 dac29c83659703a8548db561bc670832f26b30f7a88ed90a6530eb052a10df8f SHA512 fec46d295b1b4caba7c0a666eccbf3ce325fab4bd56e6a841cfdd9b7a381384dff3c71a744dda0e88ed2e99519c278c1ee495e6b8870c74cb4939dbc08d4bb96 WHIRLPOOL 7372d1a52c897e133fa75c8e06c47b3f7035cb01a3ec858f74ddc741613b11554a2d6dac6c886347f4e82baa16091cc41232a5deb3db4ae5a4930be0d1de6f41
 DIST colord-1.2.9.tar.xz 1200936 SHA256 48ce0db4f327c94c2bec11fed98a9a73f580d34c6edcd636d90831fe3bea5ae4 SHA512 d25497fa6460e5ffd7ce872bf16b60916e879cdd3aaec4c81dd4ab8446949767f3d3d49a3e654813445b049a9653334ba22d8e9a91cf6699c6063c01be382a75 WHIRLPOOL ca8edc19b162e4e97c263c1bc64d2a655d5adafeb2cb64c8bdbd7eb4e20052ce76f8ad332168088a97e654d20f0c5215d62829fed7471ac69faed3a79fc9f283
 EBUILD colord-1.2.10.ebuild 4571 SHA256 26211407e7b54f9ec20e905070c4bc26d0215f686e9757eeadfffd9c27a62f85 SHA512 51bc77ae5c2ff15a9623f5e5e79fe68be74021ce71926e008d9bb6e62563553ac5455ffc6fb95076874aee0f6c7d003f0c15795b488992d2b0138e6845a4a733 WHIRLPOOL 372918d71e4d1670db35b5e9a5ec821043f55adbcb52bb7dad05afe4c88e7d00a11cb448fa5d7eb312ebfeae441e1b234874bc3390da6e32db9d5e7af2626620
+EBUILD colord-1.2.11.ebuild 4575 SHA256 430e31be3d502f0dff299edeb923ee7d54776d4e66ad4373ff574c643b24a6bf SHA512 eb2c7665f3837f1e9850f323be7f78d32def5cef8da6e0b84b7d2b705a41e64676495502c2a7d2cd3a5df3bf0fb327953ff66b4baaeb631973bdcc1629615af7 WHIRLPOOL 0294525f75e9f1b19273104fb410697d6174bc0a42d73a50701f78a001a96a55cddeff8859a46a70be1b262c411b61622d92982d5bb7ae95144d2904ff9c2f4e
 EBUILD colord-1.2.9.ebuild 4601 SHA256 b7e531259edde09be4880ffc6e03c4d4d3a070ac0a67182571a8680b961a8e93 SHA512 32a22d34bc3eadee2cd2b9d4040e701919c2ba3bf445f3a5eff2885ac39d8e57a77656ff7dcdbbfd5f69f6725418571bf31cd80f6d3f10e90b98fb502d50a1b9 WHIRLPOOL f4ebdb3c34d1b8f642343d6e0fbc96c4523bdf26700a7694ea98a79d159771497f12df0743d96e20e858d6edb63e43a2f44c26f72ab429a556c399bc03538eff
-MISC ChangeLog 16195 SHA256 5afb67f86264d5e33b67278fb36a22c532068fe5b1d43ed9f095be28a4ccc2c2 SHA512 5aada8bb75571ccdef7ceb41d7544e537e9479e0d62719a134d3a6ed7af2f3797c785ad6a58be033e256d2463317c148f2ea8c456fbd3da76503d2b36d5cec8a WHIRLPOOL 4cd657e43557a8bb5fff28ae9fca63501e9ce03c512619e40454ff89325c832422337ae964cdb1db89c61007162d13f9af529804e22d8519f7e481bedc664bcd
+MISC ChangeLog 16312 SHA256 44532fd956a077c81467fcac82673689cca0706c82454fa7ae7b3f341d52a50e SHA512 ae77bb760b04e8166e263f5c4f9c41ccec55a9fc2b7e5907d02ee8a4bc8e99bba2ea22d47af8097729ccd79bb31f20803e8b2c736a4c9727a37bad00ee2f7f3a WHIRLPOOL a884c665844a7b0a3c5ee7958aa03c0e34b02734fb516a2c0f1ef43ec40070841f7c830ed99de358925c032d2ee5b3c979402fbffaf18e4ceb4c927ca03d7e23
 MISC metadata.xml 469 SHA256 a36a9a3cb4c04c78da19f50b10a9222e6f56b0488e5dde38849a94466992924b SHA512 2e9539600b4d8071a240ea6163981673891adfceb377d449262a7c9d70bd0f9753a19b5b5cb119b6d068e2144cb425b61112fccb8823b0f19091e7ebc456f853 WHIRLPOOL ec5ca6e8fa9f9c78000c666f71dcf34af02d8961d3064da9262e9c6886867bf93490fda36ec9c3c6d35eed62349d4cce6fb4f4dd5577e04ace056640f7e70917
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVjRpKAAoJELp701BxlEWfM0IP/imEhfaNfajQPIvTqX6LhOTH
-++zmfmh9vLulOYhXEPywS7HeY+wupDDZPrHonul1q9dvmAhPcs4QTfXziuvXG4py
-FtESTk3N3DQ/rVeW7ryCLW7PIt0WisjhSJuCoMfJ8X6ZnaFCqygQ6TkHEHfLFASv
-yFRklrPktf/k0C5CJVF5arz1aJTXPXxliLDtq1fsFXTtWUtpNbLE+ikSflVCAw5v
-Wx1sI4FVY3FDriozPwYy27mHIBeQR/7ECAmqtqIHYGCfs/AR3EfYBsChhiZwvENU
-TccVMmb2QZeHuVa3HJlD8Otxnq4RmYkGTs0+5L4G8vu7Sslg4Rg9Vfk1G8SgFdOF
-zXWa0yyn97b+P4LX3uli0sp6FOwdW7AlR3jZWPoNiHw1QxInyaDKouMugf2gQ4bb
-5WkCCV+2gcnyBgxHJ/ZNrlbdNC59uh1kv4fUS+5c0p+1MkJ+K8KnNemdIje42wVk
-CSqasdeev+oI+FHrf5GCZrhlHwJi0AqGlwbMPnV+BB8lbHNl1moHfU/SMossIbW4
-0CrB1FtbIWgUek0pXkvFKfL5T+OrJyL4ZyFlsMIilVFS2nGym4v5jOIjOvGgJ2iL
-1HXeKipUYgNCwbRwL0t0OclnjoVu4QvijEgXhW9dReC5lmEwlZYXdQFKvt/oBkqa
-WukxzfSZKzf905AwW8LH
-=JLWX
+iEYEAREIAAYFAlWY7j0ACgkQCaWpQKGI+9T61gCfY2AOCyI3ZrfJXs6JSpHctihr
+94UAn1Pu+aPkNRnH322M6zl10di4gP66
+=pkVK
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.11.ebuild b/x11-misc/colord/colord-1.2.11.ebuild
new file mode 100644
index 000000000000..3863e02d1492
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.11.ebuild
@@ -0,0 +1,171 @@
+# 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.11.ebuild,v 1.1 2015/07/05 08:43:40 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
+
+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
+		use gusb && 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
+		use gusb && 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
+		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
+}
+
+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
+}