Version bump; gtk support library was split off into x11-libs/colord-gtk.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 119 insertions, 9 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 113f1f4983a7..23e1dfef3472 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.32 2012/08/10 17:11:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.33 2012/08/10 19:01:58 tetromino Exp $
+
+*colord-0.1.22 (10 Aug 2012)
+
+  10 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +colord-0.1.22.ebuild:
+  Version bump; gtk support library was split off into x11-libs/colord-gtk.
 
   10 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> colord-0.1.18.ebuild,
   colord-0.1.21.ebuild, colord-0.1.21-r1.ebuild:
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index d2a6c551f82c..4b2f20e715c5 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -5,19 +5,21 @@ AUX colord-0.1.11-fix-automagic-vala.patch 1121 SHA256 b5e431ce7b27de4b5f2664b60
 AUX colord-0.1.15-fix-automagic-libgusb.patch 1334 SHA256 6fcfd6cdf9edba49c364625fbac0339458d8f0ff8fda489827dad176e01e1a93 SHA512 cd476b8d428a4eb2c1814c1636cc6691196000864ef67dd5bd103e5668e832abbe76930ce49e0e13a4c7b440b70cf8a8421ff3cb3ccafe9d9304742a9b9b5c2a WHIRLPOOL 6bd641fc3098a8702f3a2a0438339957f31323f61575a273ce559793e43e208161e5026ff5ee0621e22f008c72661e7109a0bbe61df4fe5e7961aa1f50a5840a
 DIST colord-0.1.18.tar.xz 475220 SHA256 87175f9bbc2c59fbe01bb99c4989393f5aaab5077da7cd91f099c6aec49e1099 SHA512 40c7f3ce1fe188e6cd50dab74deeedbcbe2720e6d75dfcc0697800e53f54ae2218b5e7241c15ec7c31910b1c94f1862a41441f220526d036bd278893b10c3d97 WHIRLPOOL d62095aeea97daadbe48a0e01f3ccb6b188f72bd5999515d2a2d1d7d866c012cdeefc3d0c3afe83208b4a6dbdf29c808b2d4de7de6b31966062f4da7312b878d
 DIST colord-0.1.21.tar.xz 553424 SHA256 360b896b0d2a35970a0cd42e448ea327d789f309ff95022190c4d33bb8b02c30 SHA512 442ef53b73466da34c3a2ad455ae4e401d6640a8093febdbb28adcda5908fcf5a043653b44f9357d02945230e3bee3f75f3e9e4d622b85adc8ebf4f5c8735537 WHIRLPOOL 91860610b7117c1a5f984f4bf778033438905a16a2f93c699be3774b6acd21c5947eb475ce83570cddde2bd5795d4e5427e8a10bc97c6438f67d7b68586800b1
+DIST colord-0.1.22.tar.xz 546956 SHA256 f7c49d8c35a602454b068d66c63a7956dc221175975d4489d64b9eeec5106afa SHA512 2e3e09fc5f6ea15f48bfb18d458725acf9bc967a6a3d87b69a06053d6daefa7b72f854a8aef979bb1d8c5e72dcfaf741732c2c0740d93d62c2b90b67bccccee1 WHIRLPOOL 6d2f9193831098c2cb1c2e9259833b3e527c41e79a57a6d0813cde6a7fc0f91bc70be8531e99b3af83cd9bc1d30cebfa0b61f8f81d1a559e746172ef2f071cfa
 EBUILD colord-0.1.18.ebuild 2472 SHA256 7b6f75c0eb8f34891d0b85949e2e286ce0ad378a87596035a87c99ea7aa1d66d SHA512 03b113ce76849193a602d32317bd560a89dc01a8619f759e678ab74bad7beadec1cb3c7a48a232c6707d419b44daf70712dbcd115be6b16e09bf46ea0cfa45f6 WHIRLPOOL 460cc2d71f862e8b7b9b1b4601323ba877c535a770cc6f9f6682b97d4eeccf0c126b30cbf2bcb566545f371708241e8c7a089f2e60fce21c176b4a29e1f72d32
 EBUILD colord-0.1.21-r1.ebuild 2835 SHA256 1ea3e485afd32b2283b106627105699c788d9d4cf928a27b45b1713e0a4ab715 SHA512 ef0ff01f7fa305095370c6cce40aef7cfab3a63166d177a808dbc92a65604905eec213f995a2d9f7075e9c538c44f3b371d7192062fde2c4f326b44f12702c95 WHIRLPOOL 32c6a29f5a82f7e7561fc58f35c4a9409b64a3fa3566e14ba56655eb5c83e8c35c00e27c2cb6af34dc3c99f4b3015196e9507375a7ac984298c67790bafc24da
 EBUILD colord-0.1.21.ebuild 2704 SHA256 9298260b912faa92eab686924da49d86a7668438ddb1d5eee69ec7a98a5b584d SHA512 a0e9a048d00ad56c693991782dd717d9b240a8c6f83ed1ce92a470e9439e600751cc92b479a12187afc271fd9acb27c8e24c7711e111f8ed56551c634c007683 WHIRLPOOL ffe82cdb69cded540a60eb9822cbc1c2ef73bf6b17e1dbc69dc3184d76b8022ec8a7c38ac1270a7b8e2f6c6c77b261756c456ddb2d5a1902dd27a7d618d357f2
-MISC ChangeLog 6341 SHA256 43a6dd4bddccb8be0fad3530bbc6fe0d0843a6068afd1cadcb3e6e176bea38da SHA512 47b4919c88895a7bbc981a965e33e858a27922a314e1dd28b605ff8f5e79ac04ff0255d45d8a63ced5779120f3d9377d1031ca5acfbe28dcd0f78f85217dea7f WHIRLPOOL f935765808624a2f5e8aa161786694b8ac1614a4fcd2875d9338e653c16fb3e699e3dce7d61edf783577ee05f9533b93692e3aeb58a6e8e1feac1bbd93d7d02c
+EBUILD colord-0.1.22.ebuild 2761 SHA256 af1a0fd086c2178435f0daed851986942bd3ac60331ac28a60c6b7cdb16ee34c SHA512 82d8ba99a2a8daa8f412c13d94b211a5730ee912995aeee5d1c3b85aa6d72e60b958c17370fb79a5eb541fa143fc9057f366e5a6dd893b5a1d28cd2a7b0c968c WHIRLPOOL 8841e263f53612e222dfe60a611980bae0dfca17eac9bdef079757bf2cda6606b087894ac500a6567d388e87da7b4315c2c2aac591f814039e80fe706ff85f43
+MISC ChangeLog 6532 SHA256 afc57b5e1e63c49cd84f632952374292c34e5753780944c19c76877bdd186dcb SHA512 d86d56d8c4cda00c69bf7ed31957e1a026048fdd0859223257b5f9f8d27c7e77927507e835a3d00db56035615e3c8131fd7b14a0b1cb2bcde5678cd0f8113c12 WHIRLPOOL 353be3d86a7958966484fabf6304f29b689a30959c08a44cf53fe5f124c55eed3dae5517c1c942681bc8672433f125b2782e56aa610fbe8d28f1133f15ec0123
 MISC metadata.xml 456 SHA256 bcf7e3df668c81ee82c603534a9411acf46e1295168999d85039d62b2d3cae42 SHA512 699ed34821bcb9ab041f6e7669f858e1cef6d2142ea30633dd4320ba14687210e8178a3572269812c53ae25573919b7ecdab608a30fd453b572e05184a816d0d WHIRLPOOL 550363c19dfc7d250a3d9b774b854c32260930ec8bd16927b2db32d7c5aa7663c31dd689f7073fac6f21f14f3253646b190e263e64a9ffe84c3647fa05b24ab0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJUjGAAoJEEdUh39IaPFNdQMH/R4sWiWMYGxKzq8GOvl0X+Tf
-0Yf7DoydC8vREc9ofOpqbHTWUmCM+vkv1PeFchSxssABMKyonulyY3/Xsmr9KAdf
-4PVcU6qCoby1IQBTRm8WH2NpohWSKUUtCsEPLsAzUV6k3CFU8jhNDuQh7BuaVCRA
-fGwXHIcNW16Sw7mR2bOJQjJHVUrfqq7jGvhSo54WbEuWnoSlxs3AI0w1sRJoNc+A
-G/b3HYDDArTAOmLQegdzzNPfpFir8nm1NWxIu4OwmOFM0IFVo1z4TkpQJu/n3AU0
-nApN4qTTiIpfN++McAZkNhoSDILPudJz+KuTLIsB69AsJoZTki7n2XZcTqTLKlM=
-=zy4n
+iQEcBAEBCAAGBQJQJVqtAAoJEJ0WA1zPCt1hIcgH/3nThKsqsoSyMVjgvSbE+HpI
+tuh7hGlhe8Gb/5skRMe4UvXjgfg0aXqyxDBdPAIQb5yTDkggmLrY+gK/fjfv3Sib
+t2E4/TWI8G4nSN9H6WXaMdNN+fwK//lPzfN1rx9Yb+cSz74tpGvzvpu3H89wj0lg
+manfLxBinvS7K8HEDXcfxkWMfInXoK/6zuEDoOPosox4+K0g3IhdUSSreAcpVyLC
+0b+spKNRyXk7NKwi2c9Vb35Q6Z2uZYsXR2Z2lctKiu+zoFoevmoZZ0KIbTjd/8ph
+4Ym0vBuJPHyfi+ST7+2QSJifcWP8hOOzvw33315/53Yg8mCVLc0tEWc0w1lxKq0=
+=GUQu
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.22.ebuild b/x11-misc/colord/colord-0.1.22.ebuild
new file mode 100644
index 000000000000..d03064cd92dc
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.22.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.22.ebuild,v 1.1 2012/08/10 19:01:58 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools bash-completion-r1 eutils user systemd base toolchain-funcs
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc examples +gusb +introspection scanner +udev vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28.0:2
+	>=media-libs/lcms-2.2:2
+	>=sys-auth/polkit-0.103
+	gusb? ( >=dev-libs/libgusb-0.1.1 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+	scanner? ( media-gfx/sane-backends )
+	udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/shared-color-profiles"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	vala? ( dev-lang/vala:0.14[vapigen] )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+
+pkg_setup() {
+	enewgroup colord
+	enewuser colord -1 -1 /var/lib/colord colord
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
+	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Reverse tools require gusb
+	econf \
+		--disable-examples \
+		--disable-static \
+		--enable-polkit \
+		--disable-volume-search \
+		--with-daemon-user=colord \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable doc gtk-doc) \
+		$(use_enable gusb) \
+		$(use_enable gusb reverse) \
+		$(use_enable introspection) \
+		$(use_enable scanner sane) \
+		$(use_enable udev gudev) \
+		$(use_enable vala) \
+		"$(systemd_with_unitdir)" \
+		VAPIGEN=$(type -P vapigen-0.14)
+	# parallel make fails in doc/api
+	use doc && MAKEOPTS="${MAKEOPTS} -j1"
+}
+
+src_install() {
+	local udevdir=/lib/udev
+	use udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	base_src_install udevrulesdir="${udevdir}"/rules.d
+
+	newbashcomp client/colormgr-completion.bash 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
+}