Bump. Notable changes: better colorimeter hardware support. Re-add automagic vala patch that somehow got lost at the 0.1.12 bump. Drop old.

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

4 files changed, 145 insertions, 89 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index e9dce0189a12..5f1d23b58f3b 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2011/10/25 13:24:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.6 2011/11/02 04:08:30 tetromino Exp $
+
+*colord-0.1.14 (02 Nov 2011)
+
+  02 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -colord-0.1.11.ebuild, +colord-0.1.14.ebuild:
+  Bump. Notable changes: better colorimeter hardware support. Re-add automagic
+  vala patch that somehow got lost at the 0.1.12 bump. Drop old.
 
   25 Oct 2011; Jeroen Roovers <jer@gentoo.org> colord-0.1.13.ebuild:
   Marked ~hppa (bug #387959).
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 80980db5bc02..8a6781bdbecf 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,20 +1,20 @@
 -----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.13-use-dbus-security-for-permissions.patch 1787 RMD160 c0aa128152e3447f61fb10bf0d89bfbd5460833e SHA1 b1561756e116023eb32a5f1732bd63fa773ad9a1 SHA256 8a228ad64a9eddbe2e9914e93b78ad7ea243d40e28cf78dfdff53d82322d6f67
-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
 DIST colord-0.1.13.tar.xz 445420 RMD160 e852a095f44d4fabb91c2a5e2b8375c8f961019e SHA1 45c20b87af947f10c9db1d8b3ed809d41b427f03 SHA256 eb3d00653d4a028f4e97f4e61ffa29940c65b42c20d4439e067cb183b725c292
-EBUILD colord-0.1.11.ebuild 1972 RMD160 08a4ad5d6a2f60c9abb3977f4051da07e7878f8c SHA1 9904a7827aef953abc3dd8198fc0b4e51999f9e4 SHA256 4e73c452eeaa3159b3314bcdde82dbc494c660c2a0222a7ee058d6043e5fdb64
+DIST colord-0.1.14.tar.xz 447900 RMD160 15711bef74c2c15cfbc5f6431b5b51ea72e08289 SHA1 6d8549df007ffb473e312325ecb076968f3dae8a SHA256 404e0f12efed3fbaca505dd1b796bbc820b3e9df9eb93e5912f7d95fe409312b
 EBUILD colord-0.1.12.ebuild 3479 RMD160 e3918dc11f6f6c5157f7777173af05554b263994 SHA1 6e72d335883f05223967addce456c573f2c3f74b SHA256 dab59cd75ad35f44b0a99a218e2b8909d9b594f093ea13c6b9d7b9dde79abdba
 EBUILD colord-0.1.13.ebuild 3842 RMD160 56e73f6382f9aa6434443d4be104c88f9382a62b SHA1 23323ce4ce4a9eef05f03f9afb60b0f0a8c892cf SHA256 f2d64d4073bed09e7cb40179a23bff41a90a5347d50acf7a12b8d6edd725e69f
-MISC ChangeLog 1517 RMD160 adf401ea63c1fd521a91c95317710dcefdf0f185 SHA1 32972c724916fd658321a4988982ff6d33683e9f SHA256 57bf0bf0d1e26e6bf5173e2dd1ac095e9415e5c9eea91e0b32511ad6f007cb05
+EBUILD colord-0.1.14.ebuild 3900 RMD160 abd9437a5781a3f90cf06a93b28b61b6a13f06d9 SHA1 bbc768fa30fb36c4f485f099723058af312c7aad SHA256 7eb80a3ffa1f401a69f3c24381a6cc2e3db80c89a87f5da11686e1f6f6a2d9a7
+MISC ChangeLog 1805 RMD160 02b4123644399bc7d872c0e8e828552679a388c9 SHA1 1a1a20c12cb183e3f2688421b9986d725714c792 SHA256 ac242ed3a93186b69e8d8c4b913e2c61d241f6f35925d8df6a4e4d30b3552a50
 MISC metadata.xml 351 RMD160 cd0e670eb32a888a9b28a82f8991939967381123 SHA1 d42d53e27ded330a8a5da23a1ffc0034bced80fb SHA256 ac4eb4676cf16d1d351488eb4130afa38e494155eec579954757191264e5e5d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6muIUACgkQVWmRsqeSphM/oQCfYELu1Oj7KBokagSSiKOsvsFC
-c2oAn1FU4QqAXrYdx5SdYmGM5Mqg5xcQ
-=doBL
+iF4EAREIAAYFAk6wwkQACgkQdjK8w9WeBnAHlAEAhzuAt5gk6IATvCeJI4M7DD5m
+qqG+9S/pNjDcifABewcA/A5e3Vbw0/APXKd5zyL0T5gcsfxivGNbxWxC8xsFCutt
+=9nlK
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.11.ebuild b/x11-misc/colord/colord-0.1.11.ebuild
deleted file mode 100644
index 24ce8a0b72f7..000000000000
--- a/x11-misc/colord/colord-0.1.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.11.ebuild,v 1.2 2011/10/05 13:19:17 nirbheek Exp $
-
-EAPI="4"
-
-inherit autotools
-
-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 vala"
-
-REQUIRED_USE="vala? ( introspection )"
-
-# XXX: 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"
-DEPEND="${COMMON_DEPEND}
-	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 )
-	vala? ( dev-lang/vala:0.12 )
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-
-	# Fix automagic vala
-	epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-examples \
-		--disable-static \
-		--enable-polkit \
-		--enable-reverse \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_enable scanner sane) \
-		$(use_enable udev gudev) \
-		$(use_enable vala) \
-		VAPIGEN=$(type -p vapigen-0.12)
-	# parallel make fails in doc/api
-	use doc && MAKEOPTS=-j1
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/x11-misc/colord/colord-0.1.14.ebuild b/x11-misc/colord/colord-0.1.14.ebuild
new file mode 100644
index 000000000000..a96f8643d968
--- /dev/null
+++ b/x11-misc/colord/colord-0.1.14.ebuild
@@ -0,0 +1,129 @@
+# 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.14.ebuild,v 1.1 2011/11/02 04:08:30 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools 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 ~hppa ~x86"
+IUSE="doc examples +introspection scanner +udev vala"
+
+# 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
+	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
+	dev-util/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() {
+	# Ubuntu patch to allow root and at_console to access colord without polkit;
+	# this behavior matches upstream default polkit settings.
+	epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
+
+	epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# Disable polkit to allow registering devices when colord is running as
+	# non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
+	econf \
+		--disable-examples \
+		--disable-static \
+		--disable-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) \
+		$(use_enable vala) \
+		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 || die
+}
+
+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
+}