From: Pacho Ramos <pacho@gentoo.org>
Date: Wed, 28 Sep 2011 11:40:40 +0000 (+0000)
Subject: Version bump that also runs as a different user than root. Thanks a lot to Alexandre... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3ac9f566869bb5f340cf931398cf359914d792fd;p=gentoo.git

Version bump that also runs as a different user than root. Thanks a lot to Alexandre Rostovtsev for doing all the work (bug #384607).

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64
---

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index f2be5a575a9c..c581bdbc4c32 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.1 2011/08/14 13:48:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.2 2011/09/28 11:40:40 pacho Exp $
+
+*colord-0.1.12 (28 Sep 2011)
+
+  28 Sep 2011; Pacho Ramos <pacho@gentoo.org> +colord-0.1.12.ebuild:
+  Version bump that also runs as a different user than root. Thanks a lot to
+  Alexandre Rostovtsev for doing all the work (bug #384607).
 
 *colord-0.1.11 (14 Aug 2011)
 
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 02f3ceec19ec..9edfefa56a08 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -3,23 +3,15 @@ Hash: SHA1
 
 AUX colord-0.1.11-fix-automagic-vala.patch 1121 RMD160 acee8cf74c62f12381a4cb89ed7c9ecfa34ca64f SHA1 7ce2fdd5676e72e050fa350e696de9c6ab8e2407 SHA256 b5e431ce7b27de4b5f2664b601f95486dc8ec0c207d1d04d8e98894b0bdd4a04
 DIST colord-0.1.11.tar.xz 470308 RMD160 58fa3d774197d62812eb4f55002b6e3c414a334b SHA1 b0d686b0adf8dcd737e03b3c8f28582532eee208 SHA256 f30e5a8838b5c15eab7cdde2670e238afe28fc673e4ade7ed6954175f8509799
+DIST colord-0.1.12.tar.xz 440284 RMD160 adeb4c1f3452ee0b23edbf5e4e778fdef2d5b518 SHA1 9bc0c4193c0f790702923e0a783962f0f26487e6 SHA256 72992ed8798e8c140bbcfe570fc65e4e6bbad727a4691142cd018a8ce107165c
 EBUILD colord-0.1.11.ebuild 2001 RMD160 dd38df9f968bce8856d9d93c841b52340121c370 SHA1 843b7002629b8e3833fa9f62e14e87220702649a SHA256 0040f84f5fa46284168782065add5e98d83d37a947e1bcfa2c0b2e8e7f2ae596
-MISC ChangeLog 425 RMD160 029c3173d409418eb8f58ba3969ab061cd910cbb SHA1 9c25ff5e6beb91b82cfd0edc280f2c784b477e76 SHA256 942eb40ac42f794edcc0fb92e4586f3edc1e2c209547d0405c88cf0e4380e06c
+EBUILD colord-0.1.12.ebuild 3505 RMD160 045e527592c8aadccd9701bc9b38311db493d00f SHA1 8d1bbfad1636357f30574bf369f46daf4c62206d SHA256 fb6b5ab11dd5f4072b310e27abdf986947c7d3c81cd5a1e1431229cd85e61b08
+MISC ChangeLog 660 RMD160 15ee7ab9cb8768d0a6a81419ce07868570013d84 SHA1 5be14ae1fdc44c3ebd369084a1a0bf42c91b9f4b SHA256 e1a4b8c610c988e0e8860ff424ac785327bb58900168ddda72ab84a7df2dd1cc
 MISC metadata.xml 351 RMD160 cd0e670eb32a888a9b28a82f8991939967381123 SHA1 d42d53e27ded330a8a5da23a1ffc0034bced80fb SHA256 ac4eb4676cf16d1d351488eb4130afa38e494155eec579954757191264e5e5d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOR9IrAAoJEO/kOhxWD91kNpAQALkQGk+yuG++jwIV7+u8ktsd
-J9mRQaovAw94w7NhFO03TybpZjPfCZGORXg7C+REztOUhofz70RzmSDdeOYBTpPZ
-ePOCr/wZJeMKTwAEQa0pZXHSBUyncQAvE+b5ar40e+LcRD/258Fvi8OfvbA+Ldfr
-zXeS1sxQQfXbVo7VSoRijJIVVb/c3SFOwMWP6sqYhfMSgHhTmFevxNc6nwBwvJ1m
-7aURUiXWTFXXLf0a1gaAVZuulMt6zeh78To3niZ6atkYW8bCg2W263UZBSHVYzdb
-8R1SAx3XTNVqnbbSgZ7rmJOFVGjzS/Ia28ajgIAnSATaraZPwBlRRvIQi/TGainz
-I+tnL3nrxSPVCk1xeCfmNArb1BVQzZmQYZQwU0XDkKvnwdQk/O9o8wDHldoXguG1
-+mbiHDEUtFbvCwofFyK+MRhsNZ04Fo57hK3zSRLOL44HUCT27Z+TiQlq3vYHVVXo
-VOkTKjHzXuaU+02JXjdLLsLB5i4JRB2jCb8xsKLkiYs4LNLwXn77uka7ddMw2OT0
-NzRr5k3TZm/qJB9cgpCj0jgs+4M/trWRsy2Xs70P6VvdzAiwr+uPzMbHRCQWICXU
-ppXkNnGlIkf69i6b8TqAwy2pp5ovwDKTbK09b8iCN821kYYazjsSGEWJYsayxUNB
-S718AGmw1Q1+ogdj+4V5
-=o86U
+iEYEARECAAYFAk6DB74ACgkQCaWpQKGI+9QX5gCbBXrabi9HA+5dyuXztTtvIhft
+Ol4AnjppnlKUEhJQ7FNRIu/3ZPhvLfpU
+=wVoh
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.12.ebuild b/x11-misc/colord/colord-0.1.12.ebuild
new file mode 100644
index 000000000000..c137610bc41c
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.12.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.12.ebuild,v 1.1 2011/09/28 11:40:40 pacho Exp $
+
+EAPI="4"
+
+inherit eutils base
+
+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="~amd64 ~x86"
+IUSE="doc examples +introspection scanner +udev"
+
+# FIXME: raise to libusb-1.0.9:1 when available
+COMMON_DEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28.0:2
+	>=dev-libs/libusb-1.0.8:1
+	>=media-libs/lcms-2.2:2
+	>=sys-auth/polkit-0.97
+	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"
+# Automagic build-time vala dependency if USE=introspection
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-utils
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	dev-util/pkgconfig
+	>=sys-devel/gettext-0.17
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	introspection? ( dev-lang/vala:0.14 )
+"
+
+# 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_configure() {
+	econf \
+		--disable-examples \
+		--disable-static \
+		--enable-polkit \
+		--enable-reverse \
+		--disable-volume-search \
+		--with-daemon-user=colord \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable scanner sane) \
+		$(use_enable udev gudev) \
+		VAPIGEN=$(type -p vapigen-0.14)
+	# parallel make fails in doc/api
+	use doc && MAKEOPTS=-j1
+}
+
+src_install() {
+	base_src_install
+
+	# Ensure config and profile directories exist and are writable
+	local d
+	for d in /var/lib/{color,colord}; do
+		keepdir "${d}"
+		fowners colord:colord "${d}"
+	done
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	find "${D}" -name "*.la" -delete
+}
+
+pkg_postinst() {
+	# <=colord-0.1.11 ran as root and used /var/lib/lib/colord to store
+	# configuration files and /var/lib/lib/color for custom color profiles.
+	local old_dir="${EROOT}var/lib/lib/colord"
+	local new_dir="${EROOT}var/lib/colord"
+
+	if [[ -e "${old_dir}/mapping.db" || -e "${old_dir}/storage.db" ]] && \
+	   ! [[ -e "${new_dir}/mapping.db" || -e "${new_dir}/storage.db" ]]; then
+		elog "Old colord configuration files are present in ${old_dir}. If you"
+		elog "are upgrading from colord-0.1.11 or older and had previously"
+		elog "customized your color management settings, you will need to copy"
+		elog "these files to ${new_dir} and then change the file ownership"
+		elog "to colord:colord :"
+		elog
+		elog " # cp ${old_dir}/*.db ${new_dir}"
+		elog " # chown colord:colord ${new_dir}/*.db"
+		elog
+	fi
+	old_dir="${EROOT}var/lib/lib/color"
+	new_dir="${EROOT}var/lib/color"
+	if [[ -e "${old_dir}/icc" && ! -e "${new_dir}/icc" ]]; then
+		elog "Old custom color profiles are present in ${old_dir}. If you are"
+		elog "upgrading from colord-0.1.11 or older, you will need to copy them"
+		elog "to ${new_dir} and then change the ownership to colord:colord :"
+		elog
+		elog " # cp -r ${old_dir}/icc ${new_dir}"
+		elog " # chown -R colord:colord ${new_dir}/icc"
+		elog
+	fi
+}