Query udevdir from udev.pc pkg-config file for correct rules.d path.

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

3 files changed, 129 insertions, 24 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index a9a879a682f3..c47b139213eb 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,11 @@
 # 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.30 2012/05/27 03:59:19 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.31 2012/08/10 17:08:35 ssuominen Exp $
+
+*colord-0.1.21-r1 (10 Aug 2012)
+
+  10 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +colord-0.1.21-r1.ebuild:
+  Query udevdir from udev.pc pkg-config file for correct rules.d path.
 
   27 May 2012; Matt Turner <mattst88@gentoo.org> colord-0.1.21.ebuild:
   Added ~alpha, bug 390345.
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 5dcef5b7350b..1400a12dd85a 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,28 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX colord-0.1.11-fix-automagic-vala.patch 1121 RMD160 acee8cf74c62f12381a4cb89ed7c9ecfa34ca64f SHA1 7ce2fdd5676e72e050fa350e696de9c6ab8e2407 SHA256 b5e431ce7b27de4b5f2664b601f95486dc8ec0c207d1d04d8e98894b0bdd4a04
-AUX colord-0.1.15-fix-automagic-libgusb.patch 1334 RMD160 97356055c34c60479bcf4054f715fcf82808f352 SHA1 4024ed54327179aeab73f6f8072fa2e226223a5b SHA256 6fcfd6cdf9edba49c364625fbac0339458d8f0ff8fda489827dad176e01e1a93
-DIST colord-0.1.18.tar.xz 475220 RMD160 8eeae6a1f715df451c7267eb0e147b299b90990e SHA1 6127e723a9beb932aae7a43b6e6b5fdb84c39611 SHA256 87175f9bbc2c59fbe01bb99c4989393f5aaab5077da7cd91f099c6aec49e1099
-DIST colord-0.1.21.tar.xz 553424 RMD160 b1b0abc01ecb47800d015964b4d01a48d31ffcdd SHA1 dbf981beec70e81c45cf46b150f426fc1eb56c24 SHA256 360b896b0d2a35970a0cd42e448ea327d789f309ff95022190c4d33bb8b02c30
-EBUILD colord-0.1.18.ebuild 2461 RMD160 c8278cb9544b5591219a3b3566832317afdb9a81 SHA1 64cf8fa52aa71db81b4c03a4cbae4cefd7e744fe SHA256 24973cbcf48a09a6448a4fde8d14cd02ed06f9885109a14dd5b3c126bfc3f245
-EBUILD colord-0.1.21.ebuild 2698 RMD160 5e47afec22f8a86437489a481f5715aa16be267a SHA1 077f9cf822562067bc22f29f511e5d35b5db5744 SHA256 fc299d3639f4c5c3c35cc758c0d2bd4e13d890b24ebb7001f09687f613a1310f
-MISC ChangeLog 5957 RMD160 fdbb5b39f58f68daad57d24908596b7afe7d8774 SHA1 7732fca3a6f1d7e7d0035c313ba3ae0dd8de22f1 SHA256 9787ac6b1bab2df62843d38b811865c56c30a58d5a662835a96e2c32b6e98fef
-MISC metadata.xml 456 RMD160 3ca59cd39080b748bc677203643f116ccf2ec870 SHA1 fd84eba4a350b17e9303a7882211d475ca41e4bd SHA256 bcf7e3df668c81ee82c603534a9411acf46e1295168999d85039d62b2d3cae42
+AUX colord-0.1.11-fix-automagic-vala.patch 1121 SHA256 b5e431ce7b27de4b5f2664b601f95486dc8ec0c207d1d04d8e98894b0bdd4a04 SHA512 862fce2b30be58c0d7c97e3e91ca1aedbe2159dd89b0bf7e895974b97e07dcc78daf1fd1382c67dbc9aae3a54b85e5893bd452a8d0767cdaadeef3b3e51d6009 WHIRLPOOL eeebcd49b5648bccc9d38638f88c896c362d744a522e8c5025ac95e0fc0b6c45ec4fcf2b16c7a485bf56da6e5da2988159c9f8e04cc6f368803c2d78c05872d8
+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
+EBUILD colord-0.1.18.ebuild 2461 SHA256 24973cbcf48a09a6448a4fde8d14cd02ed06f9885109a14dd5b3c126bfc3f245 SHA512 7bbee9aa15fd2fb4ae64144886f1805794e3885f48d6deb010bf95e3e996a67bbc3ff9960b8b86ca6662d2f35d3af2b26196f594adab745e8f5d88014f1c2bb4 WHIRLPOOL 0290e1bf595ea2065bc5894dcbb3c60260d5acdfda6f887c4ae2b46bdfe088081a2c29843cd927c18e29ad1e1ebaae460a98990d5183598058732956e7feeeb4
+EBUILD colord-0.1.21-r1.ebuild 2845 SHA256 1e194db41a8641d8504bc4846eca7dc2721728682d461d529c62e7f893b223c7 SHA512 d21fc6d7e3b7bd1eef6a05dfb7c4655e35ef2ff0e313c6263cd1e27c709bad6797864aa61d6e8d866af65249a4955acec8f4c16ca588f3c12674ad9074ff8921 WHIRLPOOL 728345fad70061f2cc29d198895a21ba64c8521716d812f053a1d43bdb06dbabdbf906786c33c31f449e36ce39f6188bfc2f550b8dd50d0bf33e0f01034bf380
+EBUILD colord-0.1.21.ebuild 2698 SHA256 fc299d3639f4c5c3c35cc758c0d2bd4e13d890b24ebb7001f09687f613a1310f SHA512 add7b0b93c2203a7969ea0c3863ac750505d50d5f04da4a3fc69bd653389b1527e9de8c8cb16cb40aac9e49d22b2f56d665e6ab3ab6859fa9e5b5b4db4f7b59d WHIRLPOOL fdce669d4fd49933feeb279b82e475ff0c7ea5f9c34fde017a362ad4a9e002d4e41872e8b0051b6694a52a9baadce46f0b7a1bddc0dd653b71cb4b3ebadb0792
+MISC ChangeLog 6143 SHA256 889a604cc4ea4a128a84db333a0b99d01d8863454796c1391983c88195f4ac05 SHA512 e6cca942b56c0c05a08f76ff46a4f447a1da2db752a85c2d6b742db1b90ad1a52c75842c15130604b40a0e006bf3a15dfd30fff3f35c50999fb6c6c43bd6058c WHIRLPOOL cfd2d901bcc88efd210ca4838a7d499cf534ff15c77af7774bb8d06188a81be25be07a506cb80edf3a6cb549bd1b8d5b59962fc6e95df08d33413a3e19dc3a08
+MISC metadata.xml 456 SHA256 bcf7e3df668c81ee82c603534a9411acf46e1295168999d85039d62b2d3cae42 SHA512 699ed34821bcb9ab041f6e7669f858e1cef6d2142ea30633dd4320ba14687210e8178a3572269812c53ae25573919b7ecdab608a30fd453b572e05184a816d0d WHIRLPOOL 550363c19dfc7d250a3d9b774b854c32260930ec8bd16927b2db32d7c5aa7663c31dd689f7073fac6f21f14f3253646b190e263e64a9ffe84c3647fa05b24ab0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPwaabAAoJEA/daC2XTKcqwm4P/1JAlcCfyrd0jxYquvtndHWY
-RPAmPzkBmQFxx4uu8t1e82X2/rOPzwABokvezMVL0uxHTH6zLVdoD6UOpgDCRQ8d
-im5p0hX/SHnvcMc2yooK1EUgnaw54jaJkcLnRUkTJLarv7TXf5r04uJ/odkb3wx7
-moeCb0WVpiG1SsX5Ii+sNUeD68z6tJksZVr+JHl6pMfy7XyHI3fM8G7eTn4rIazq
-hQeicaigQz+qTHCHnK05DLAEHPo6csKAk+pXuNjZtbiRaLcYqV8s69ZCIDXZF96B
-PFwmPTzzmW/02sCi0ee82PJ3mbiSv+MyVGBFs/tc7aVWTB0VyC0WW8+CIUHp4H2d
-zL/jcFjk+heizU+ncBdBxHzem8DajnZNFxt8cu202aO6YJepZifPjVUi7rrgNE+f
-YqKm3P50Gk8oid3k7/G1poABA3iSjTDuG+hmwScUMlp/uMnrScNf/obgVUQUNW3J
-Es/3omJGxlAMrw6uJgZq79GuiBrG6Rp4Lfkfnwpzkqe83UjIzzJbrpVR5KbEOu+N
-8ZrokNOXQvWAcxMt9keqiJ1Oi6XKLFr/NE85T5+jZxiQJFuWjPTDG24l7NQnWTFk
-dZCYPHv/0MFt/4AFhMDL837XCQl0ttxT7D3Izn7zyedT+ddhyoRDJpOhlkydc5fr
-C8FRFm3+Ws44pgreU19c
-=mV3M
+iQEcBAEBCAAGBQJQJT/7AAoJEEdUh39IaPFNtIMIAJJEyfpXqxNFKnww+mKR7r+b
+ZZq3sZ9DsFwVSwnsFHV004WdCoEbQKtzooqJqGOCuRQP8JaSQf0dnf8Nxch+z/Hg
+8c1RfvVA/wMz7iDlyODJeZ0I0ZM0IlBMSQ4mkg056rXQRLW0Ks7hp7RMty8UzDDp
+TimTpLfcu+DJX/7kNBGbteBQQvRmxIyJ90F+QWmGjNb3OnCCzS2vrWof1t3Khqb1
+ZZHYCu1v6vWoIYCvcEcATy+v2e75uk6uPXRjbBVlnYD5cf8as7B2kFUSxdUB0ahK
+6xciksDp1BhJpSVsH2vy0RHJdVyvB7M5rUV/pudaHJJ+ski3zoeZ7xmrgBBTkxo=
+=fA0V
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.21-r1.ebuild b/x11-misc/colord/colord-0.1.21-r1.ebuild
new file mode 100644
index 000000000000..038bc9b13bed
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.21-r1.ebuild
@@ -0,0 +1,105 @@
+# 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.21-r1.ebuild,v 1.1 2012/08/10 17:08:35 ssuominen Exp $
+
+EAPI="4"
+
+inherit autotools bash-completion-r1 eutils 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 gtk +gusb +introspection scanner +udev vala"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28.0:2
+	>=media-libs/lcms-2.2:2
+	>=sys-auth/polkit-0.103
+	gtk? (
+		x11-libs/gdk-pixbuf:2[introspection?]
+		x11-libs/gtk+:3[introspection?] )
+	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
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+	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 gtk) \
+		$(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 udevrulesdir=/lib/udev
+	use udev && udevrulesdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"/rules.d
+
+	base_src_install udevrulesdir="${udevrulesdir}"
+
+	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
+}