Version bump, adds support for color profiles for gtk widgets. Drop old.

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

7 files changed, 34 insertions, 407 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index bccf69b5a6a5..473ff2397dd9 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,14 @@
 # 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.28 2012/05/22 16:13:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.29 2012/05/24 05:54:07 tetromino Exp $
+
+*colord-0.1.21 (24 May 2012)
+
+  24 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/colord-0.1.13-use-dbus-security-for-permissions.patch,
+  -colord-0.1.15.ebuild, -colord-0.1.16.ebuild, -colord-0.1.17.ebuild,
+  -files/colord-0.1.17-glib-2.30.patch, +colord-0.1.21.ebuild:
+  Version bump, adds support for color profiles for gtk widgets. Drop old.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> colord-0.1.15.ebuild:
   Use virtual/libusb instead of dev-libs/libusb.
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 754128828fb6..53851547f45d 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -2,27 +2,21 @@
 Hash: SHA1
 
 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
 AUX colord-0.1.15-fix-automagic-libgusb.patch 1334 RMD160 97356055c34c60479bcf4054f715fcf82808f352 SHA1 4024ed54327179aeab73f6f8072fa2e226223a5b SHA256 6fcfd6cdf9edba49c364625fbac0339458d8f0ff8fda489827dad176e01e1a93
-AUX colord-0.1.17-glib-2.30.patch 967 RMD160 ad6d5559f23777b788ef8b9e5a205247528eb2df SHA1 e3f32f4f8f3b0a002402771d95f9f8b7fc52d773 SHA256 8910ff53f9ed9b76881ef8fd1cc5ecc4203be364da10ec5559c79feef511df46
-DIST colord-0.1.15.tar.xz 456776 RMD160 1ccd8be1410252e21a26e83b06462ac1def1b953 SHA1 e83a68add3fac9c677829925794ee353743dc9c8 SHA256 dff56476e02527899f4a2c39eeb092af369ab5dac1e21cbb6a5b0955b5c6e746
-DIST colord-0.1.16.tar.xz 491252 RMD160 f43ddf21648f4ae8a3f4122cb6c15d0b212b64a9 SHA1 bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c SHA256 9489e29e7f5f529f759f7b913ccb8147e702bcdad641dfc1f94a1fc74dd942b1
-DIST colord-0.1.17.tar.xz 452900 RMD160 dc5d1896c2bb2e7b72cf04c0f3a1d4b476be9c27 SHA1 7716c58a7ab85029637c7e88bdb77e48b6cd5ce9 SHA256 bbd9e2865c7ef7f62e65ba055ca4447d062cc76548328e101d7fd0ed8c22b25d
 DIST colord-0.1.18.tar.xz 475220 RMD160 8eeae6a1f715df451c7267eb0e147b299b90990e SHA1 6127e723a9beb932aae7a43b6e6b5fdb84c39611 SHA256 87175f9bbc2c59fbe01bb99c4989393f5aaab5077da7cd91f099c6aec49e1099
-EBUILD colord-0.1.15.ebuild 4428 RMD160 cdd2bdcb79858b9dec685c0dbcdc363c1a4b5f06 SHA1 ba28a995cbf8a3aecd4def598b37a4b6208cfc6e SHA256 41e7f9648cf12e2abcd8ccdd1c87533888eb31cfefe36926ca31405d74a2e118
-EBUILD colord-0.1.16.ebuild 4067 RMD160 ed824822f4c4c29ae2a017cbd9ac666bc9f04785 SHA1 1bed22b31b057f547ce7adac793805595a4299cb SHA256 145d06ff97f400d3818f29cbcedf3d1ff1ed0ae80e8debc487087f68cebcb9b5
-EBUILD colord-0.1.17.ebuild 3817 RMD160 b09fe01b2aea5328fd0944048d35f8ea7160dfa6 SHA1 b34cd87ab99ca4596e218f31102099cb032b6c92 SHA256 d57e40e14d3c4d9791c0661264c7ce587ba57d1288ca6a811f13dfaca79ca8b0
+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
-MISC ChangeLog 5495 RMD160 463c1177fdf45e1330ed8053d41932db6bb63837 SHA1 ce267cd59f2d85fbd0321d5015e731750b9c2c67 SHA256 46fa028d09e8b621215e6b125b8e83e4fa5bca9619c7a19c3f4d4338c7b440ad
+EBUILD colord-0.1.21.ebuild 2692 RMD160 8d936991d623d448d013aca1ac3366d026c3da1e SHA1 13c62f51cddec57866e91ae7d1144bfe7953f28b SHA256 30104b6def4e1cc931a512f53bbd8a2c430123b7529b2f3b7a116fbec9399fa9
+MISC ChangeLog 5858 RMD160 228dc7025288c94e2b20d93f984b01eccd5132e2 SHA1 86678055c25b05473f28d4339eaacbd5daac824a SHA256 cb087887cff8a0bfa661a7102c87da51f36488673483caffc010970091d59e39
 MISC metadata.xml 456 RMD160 3ca59cd39080b748bc677203643f116ccf2ec870 SHA1 fd84eba4a350b17e9303a7882211d475ca41e4bd SHA256 bcf7e3df668c81ee82c603534a9411acf46e1295168999d85039d62b2d3cae42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu7qGAAoJEEdUh39IaPFNGwAH/2Getp1pQmViEZIjbxOdcMo4
-CH0qAh2srCMk775l87142K4Y06cbdv3BQBdbf56AqPu1YDdOXigiAoiwy47k80fu
-1DLDNxIMm7d417BGiUf7BtMq26KO6Y2jyhouoAE1Lv9FNYbHTyEcVpBJWh1o4KXO
-GNrI/x9etYGCQRAf3wgSxq2Trr8McKxhx018qY1xiNjgoyQUO3V8lXcSQhf9TWS8
-B5r+kpUHeEcL1tUaOJmzc6Qp0CC2y7wO0YIPmk7PL2jgrC1NE6Kicehj2x4O9BGn
-vx2Q8KDawakqjIilXXufzh3oqantcW1AUMmUx9LAVQauVqdLS/jdMkKxTvCJzkI=
-=1VY0
+iQEcBAEBAgAGBQJPvc0EAAoJEJ0WA1zPCt1hhw0H/jfd1tFKZ+8MxOJ3HHAtJWI4
+GFtvUy4YogoIIDmEeYx4bSdietCnBRhlsRS8j29KgHpPsw04COr2wsuw3OawmswP
++NdaweqP8yZaVtbl2HyHLvLefes1/mPJjElMxwNMZ36p6JOkNzVx8kty3IxKD9dp
+E9125gagkppQ1bEWe8bl1UyNsyXRUtdppcqC9N9MK30Q5gjs5O8BfwRV8Apb5Nke
+kFXz8qR0L1Hs6BGKcoSclylxpxNLg7ptK0M4eJln6s2eAIPWtlDDRDqOQWH4SLrJ
+29XKb34G4KeV9idNzrEtAqWqGIM/KqvJaUoVfdklxeRjCflr4Zf1WjjxrVGU8X4=
+=3GA8
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.15.ebuild b/x11-misc/colord/colord-0.1.15.ebuild
deleted file mode 100644
index e817e28251bc..000000000000
--- a/x11-misc/colord/colord-0.1.15.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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.15.ebuild,v 1.10 2012/05/22 16:13:52 ssuominen 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 arm hppa x86 ~x86-fbsd"
-IUSE="doc elibc_FreeBSD examples gusb +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
-	>=media-libs/lcms-2.2:2
-	elibc_FreeBSD? ( >=sys-freebsd/freebsd-lib-8.0[usb] )
-	!elibc_FreeBSD? ( virtual/libusb:1 )
-	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() {
-	# 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"
-	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
-
-	# Use <libusb.h> for freebsd compatibility, bug #387959#c6
-	sed -e 's:#include <libusb-1.0/libusb.h>:#include <libusb.h>:' \
-		-i src/sensors/*.c src/sensors/*.h || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	#  bug #387959#c6
-	if use elibc_FreeBSD; then
-		export USB_CFLAGS="-I${EPREFIX}/usr/include"
-		export USB_LIBS="-lusb"
-	fi
-
-	# 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 gusb) \
-		$(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
-}
diff --git a/x11-misc/colord/colord-0.1.16.ebuild b/x11-misc/colord/colord-0.1.16.ebuild
deleted file mode 100644
index 940d7235cf3d..000000000000
--- a/x11-misc/colord/colord-0.1.16.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.16.ebuild,v 1.4 2012/05/05 04:53:45 jdhore Exp $
-
-EAPI="4"
-
-inherit autotools eutils systemd 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 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc examples +gusb +introspection scanner +udev vala"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.28.0:2
-	>=media-libs/lcms-2.2:2
-	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() {
-	# 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"
-	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.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
-	# Reverse tools require gusb
-	econf \
-		--disable-examples \
-		--disable-static \
-		--disable-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() {
-	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
-}
diff --git a/x11-misc/colord/colord-0.1.17.ebuild b/x11-misc/colord/colord-0.1.21.ebuild
index ebf1e73b7246..3a33f7617ba5 100644
--- a/x11-misc/colord/colord-0.1.17.ebuild
+++ b/x11-misc/colord/colord-0.1.21.ebuild
@@ -1,10 +1,10 @@
 # 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.17.ebuild,v 1.2 2012/05/05 04:53:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.21.ebuild,v 1.1 2012/05/24 05:54:07 tetromino Exp $
 
 EAPI="4"
 
-inherit autotools eutils systemd base
+inherit autotools bash-completion-r1 eutils systemd base
 
 DESCRIPTION="System service to accurately color manage input and output devices"
 HOMEPAGE="http://www.freedesktop.org/software/colord/"
@@ -12,14 +12,17 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc examples +gusb +introspection scanner +udev vala"
+KEYWORDS="~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 )
@@ -53,9 +56,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
 	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
 
-	# Upstream patch to fix glib-2.30 compat
-	epatch "${FILESDIR}/${P}-glib-2.30.patch"
-
 	eautoreconf
 }
 
@@ -69,6 +69,7 @@ src_configure() {
 		--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) \
@@ -84,12 +85,13 @@ src_configure() {
 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
+	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
@@ -98,34 +100,3 @@ src_install() {
 
 	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
-}
diff --git a/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch b/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
deleted file mode 100644
index 8ae60c2b8d10..000000000000
--- a/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: colord/data/org.freedesktop.ColorManager.conf.in
-===================================================================
---- colord.orig/data/org.freedesktop.ColorManager.conf.in	2011-09-01 17:59:58.330626765 +1000
-+++ colord/data/org.freedesktop.ColorManager.conf.in	2011-09-01 18:02:25.410628315 +1000
-@@ -16,8 +16,8 @@
-     <allow own="org.freedesktop.ColorManager"/>
-   </policy>
- 
-- <!-- Allow anyone to call into the service - we'll reject callers using PolicyKit -->
--  <policy context="default">
-+ <!-- Use at_console policy rather than PolicyKit to allow running as colord user -->
-+  <policy at_console="true">
-     <allow send_destination="org.freedesktop.ColorManager"
-            send_interface="org.freedesktop.ColorManager"/>
-     <allow send_destination="org.freedesktop.ColorManager"
-@@ -32,5 +32,20 @@
-            send_interface="org.freedesktop.DBus.Introspectable"/>
-   </policy>
- 
-+  <!-- Also allow root to access the API; cupsd needs to talk to colord -->
-+  <policy user="root">
-+    <allow send_destination="org.freedesktop.ColorManager"
-+           send_interface="org.freedesktop.ColorManager"/>
-+    <allow send_destination="org.freedesktop.ColorManager"
-+           send_interface="org.freedesktop.ColorManager.Profile"/>
-+    <allow send_destination="org.freedesktop.ColorManager"
-+           send_interface="org.freedesktop.ColorManager.Device"/>
-+    <allow send_destination="org.freedesktop.ColorManager"
-+           send_interface="org.freedesktop.ColorManager.Sensor"/>
-+    <allow send_destination="org.freedesktop.ColorManager"
-+           send_interface="org.freedesktop.DBus.Properties"/>
-+    <allow send_destination="org.freedesktop.ColorManager"
-+           send_interface="org.freedesktop.DBus.Introspectable"/>
-+  </policy>
- </busconfig>
- 
diff --git a/x11-misc/colord/files/colord-0.1.17-glib-2.30.patch b/x11-misc/colord/files/colord-0.1.17-glib-2.30.patch
deleted file mode 100644
index 5b84fc9838f4..000000000000
--- a/x11-misc/colord/files/colord-0.1.17-glib-2.30.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 638a98fef16fa15946522d4112660b4b20c0d630
-Author: Richard Hughes <richard@hughsie.com>
-Date:   Thu Feb 23 10:43:37 2012 +0000
-
-    trivial: Fix compile with older versions of GLib
-    
-    g_mapped_file_new_from_fd() was introduced in 2.31.0 not 2.30.0 as the
-    docs suggested.
-    
-    Resoves https://bugs.freedesktop.org/show_bug.cgi?id=46481
-
-diff --git a/src/cd-profile.c b/src/cd-profile.c
-index a292616..323588b 100644
---- a/src/cd-profile.c
-+++ b/src/cd-profile.c
-@@ -1066,7 +1066,17 @@ cd_profile_set_fd (CdProfile *profile,
- 	}
- 
- 	/* create a mapped file */
-+#if GLIB_CHECK_VERSION(2,31,0)
- 	priv->mapped_file = g_mapped_file_new_from_fd (fd, FALSE, error);
-+	if (priv->mapped_file == NULL) {
-+		g_set_error (error,
-+			     CD_MAIN_ERROR,
-+			     CD_MAIN_ERROR_FAILED,
-+			     "failed to create mapped file from fd %i",
-+			     fd);
-+		goto out;
-+	}
-+#endif
- 
- 	/* parse the ICC file */
- 	lcms_profile = cmsOpenProfileFromStream (stream, "r");