Version bump. Adds systemd support. All colorimeter drivers now use libgusb instead of libusb, so enable USE=gusb by default. Drop old.

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

6 files changed, 33 insertions, 330 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index bbeda21c5d13..c07b978a6791 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2012/01/18 21:07:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.17 2012/01/21 04:09:09 tetromino Exp $
+
+*colord-0.1.16 (21 Jan 2012)
+
+  21 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -colord-0.1.14-r1.ebuild, -files/colord-0.1.14-sql-injections.patch,
+  -files/colord-0.1.14-sql-injections-2.patch, +colord-0.1.16.ebuild,
+  metadata.xml:
+  Version bump. Adds systemd support. All colorimeter drivers now use libgusb
+  instead of libusb, so enable USE=gusb by default. Drop old.
 
   18 Jan 2012; Markus Meier <maekke@gentoo.org> colord-0.1.15.ebuild:
   arm stable, bug #393007
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 4b3a7a7460d2..377016796f3b 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,21 +1,19 @@
 -----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
-AUX colord-0.1.14-sql-injections-2.patch 4879 RMD160 c4adee229fb07f3341df59c570c4e7c649e41ce2 SHA1 a5b57738edb2cb77173c259d7810b5b767dbadd8 SHA256 a97caf3bc1f6c90dde2a10a836cb677b7ba47585b85488117006b6c970d9322d
-AUX colord-0.1.14-sql-injections.patch 4655 RMD160 0bdf5aaf762891289399fcd92a62747e4fbe52d4 SHA1 7a8d830e3556a31aa5209966830394b4996e79ef SHA256 de1ea78a356c7131a9e77838cad0fdb06357bcc18fd4b3249ffebe71eddd772b
 AUX colord-0.1.15-fix-automagic-libgusb.patch 1334 RMD160 97356055c34c60479bcf4054f715fcf82808f352 SHA1 4024ed54327179aeab73f6f8072fa2e226223a5b SHA256 6fcfd6cdf9edba49c364625fbac0339458d8f0ff8fda489827dad176e01e1a93
-DIST colord-0.1.14.tar.xz 447900 RMD160 15711bef74c2c15cfbc5f6431b5b51ea72e08289 SHA1 6d8549df007ffb473e312325ecb076968f3dae8a SHA256 404e0f12efed3fbaca505dd1b796bbc820b3e9df9eb93e5912f7d95fe409312b
 DIST colord-0.1.15.tar.xz 456776 RMD160 1ccd8be1410252e21a26e83b06462ac1def1b953 SHA1 e83a68add3fac9c677829925794ee353743dc9c8 SHA256 dff56476e02527899f4a2c39eeb092af369ab5dac1e21cbb6a5b0955b5c6e746
-EBUILD colord-0.1.14-r1.ebuild 4452 RMD160 f54a45087bed1c59b5a76081710f24c9bfea1e9b SHA1 8049867a0d5894b8a392d37b279043f230f16a56 SHA256 fc69b24923061beece19a878a1654299dd8aad3bbbf3e98441b1e06f3b356c92
+DIST colord-0.1.16.tar.xz 491252 RMD160 f43ddf21648f4ae8a3f4122cb6c15d0b212b64a9 SHA1 bd2fbad0043d2c1f55ab7ff8cb5e261b684e699c SHA256 9489e29e7f5f529f759f7b913ccb8147e702bcdad641dfc1f94a1fc74dd942b1
 EBUILD colord-0.1.15.ebuild 4434 RMD160 fa4587d743d56d04381dd29e9a09b2d77dc7bddf SHA1 03f43fbc7ecdb770e0c973cf2e2b5e17cfab8659 SHA256 273eea5b0e8652e8e0a464b109185d990e1925aa908a6388f0549e768ec79309
-MISC ChangeLog 3527 RMD160 f5d6f8d7d5b37c58e4b03cf6818abd47f7ae94a8 SHA1 a2d16a64af8e42293b8b173ba0beadbcb5b775d2 SHA256 c048d6336e3c33417a836ba5854526217accf51e2094c183fbb6c8929bcd78b1
-MISC metadata.xml 488 RMD160 57390457348dd74553ee55155e8891e89eade5b7 SHA1 087a9680b60307373757e0f4eec8c2389b31d030 SHA256 e9d8e97cdef9d492c3bf954e1185f497cc2a7f8ddc390131cb56cd86ef2f33ae
+EBUILD colord-0.1.16.ebuild 4059 RMD160 8f606b57e4512ab22e5cdf51398eb1f7c883b03f SHA1 c3116558f60299cb56b911eac46c042fb44e481e SHA256 926168cca289f01329d75668c21ba33c93819b15d26633ddd0bfd4cdcf7f1e7e
+MISC ChangeLog 3917 RMD160 e7c7afb459b7d0f03cd26e3cd284300319a79f77 SHA1 7da23657ac5304f4512f651c2fd87b28d334255e SHA256 c530335b8e89007aad735e78f2624bff66021eaa3128e15615f0f95785c1442d
+MISC metadata.xml 456 RMD160 3ca59cd39080b748bc677203643f116ccf2ec870 SHA1 fd84eba4a350b17e9303a7882211d475ca41e4bd SHA256 bcf7e3df668c81ee82c603534a9411acf46e1295168999d85039d62b2d3cae42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8XNSgACgkQkKaRLQcq0GJK1wCbBc89dsPVAmYprRhKNXtFTzQM
-xTQAoKy4DjNKO6SBCY5V5mgBtteabHYM
-=+725
+iF4EAREIAAYFAk8aOmsACgkQdjK8w9WeBnCNmwD5AcPmFWUDZRkxLVMob6MSJABN
+0N3jtqtDI0mlXEbv+GQA/iW+COBYtfGq++rL/AVqAyw+J2xMXnKyzi9SljqO73ZR
+=2pnB
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.14-r1.ebuild b/x11-misc/colord/colord-0.1.16.ebuild
index 9c1cc90382e1..6072523166a7 100644
--- a/x11-misc/colord/colord-0.1.14-r1.ebuild
+++ b/x11-misc/colord/colord-0.1.16.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.14-r1.ebuild,v 1.1 2011/11/25 18:15:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.16.ebuild,v 1.1 2012/01/21 04:09:09 tetromino Exp $
 
 EAPI="4"
 
-inherit autotools eutils base
+inherit autotools eutils systemd base
 
 DESCRIPTION="System service to accurately color manage input and output devices"
 HOMEPAGE="http://www.freedesktop.org/software/colord/"
@@ -12,16 +12,14 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="doc elibc_FreeBSD examples +introspection scanner +udev vala"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
+IUSE="doc 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? ( >=dev-libs/libusb-1.0.8: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] ) )
@@ -51,48 +49,38 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Fix SQL injection vulnerability (bug #391879); will be in next release
-	epatch "${FILESDIR}/${P}-sql-injections"{,-2}.patch
-
 	# 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"
-
-	# 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"
+	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
 
 	eautoreconf
 }
 
 src_configure() {
-	#  bug #387959#c6
-	if use elibc_FreeBSD; then
-		USB_CFLAGS="-I${EPREFIX}/usr/include"
-		USB_LIBS="-lusb"
-		echo "$USB_CFLAGS $USB_LIBS"
-	fi
-
 	# 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 \
-		--enable-reverse \
 		--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=-j1
+	use doc && MAKEOPTS="${MAKEOPTS} -j1"
 }
 
 src_install() {
diff --git a/x11-misc/colord/files/colord-0.1.14-sql-injections-2.patch b/x11-misc/colord/files/colord-0.1.14-sql-injections-2.patch
deleted file mode 100644
index fa6497a773d6..000000000000
--- a/x11-misc/colord/files/colord-0.1.14-sql-injections-2.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 36549e0ed255e7dfa7852d08a75dd5f00cbd270e Mon Sep 17 00:00:00 2001
-From: Ludwig Nussel <ludwig.nussel@suse.de>
-Date: Fri, 25 Nov 2011 11:14:21 +0100
-Subject: [PATCH] fix more sql injections
-
-https://bugs.freedesktop.org/show_bug.cgi?id=42904
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- src/cd-device-db.c |   42 +++++++++++++++++++++---------------------
- 1 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/src/cd-device-db.c b/src/cd-device-db.c
-index 808a338..e69fa64 100644
---- a/src/cd-device-db.c
-+++ b/src/cd-device-db.c
-@@ -151,8 +151,8 @@ cd_device_db_add (CdDeviceDb *ddb,
- 	g_return_val_if_fail (ddb->priv->db != NULL, FALSE);
- 
- 	g_debug ("CdDeviceDb: add device %s", device_id);
--	statement = g_strdup_printf ("INSERT INTO devices (device_id) "
--				     "VALUES ('%s')",
-+	statement = sqlite3_mprintf ("INSERT INTO devices (device_id) "
-+				     "VALUES ('%q')",
- 				     device_id);
- 
- 	/* insert the entry */
-@@ -168,7 +168,7 @@ cd_device_db_add (CdDeviceDb *ddb,
- 		goto out;
- 	}
- out:
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return ret;
- }
- 
-@@ -191,9 +191,9 @@ cd_device_db_set_property (CdDeviceDb *ddb,
- 	g_return_val_if_fail (ddb->priv->db != NULL, FALSE);
- 
- 	g_debug ("CdDeviceDb: add device %s [%s=%s]", device_id, property, value);
--	statement = g_strdup_printf ("INSERT INTO properties (device_id, "
-+	statement = sqlite3_mprintf ("INSERT INTO properties (device_id, "
- 				     "property, value) "
--				     "VALUES ('%s', '%s', '%s')",
-+				     "VALUES ('%q', '%q', '%q')",
- 				     device_id, property, value);
- 
- 	/* insert the entry */
-@@ -209,7 +209,7 @@ cd_device_db_set_property (CdDeviceDb *ddb,
- 		goto out;
- 	}
- out:
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return ret;
- }
- 
-@@ -232,8 +232,8 @@ cd_device_db_remove (CdDeviceDb *ddb,
- 
- 	/* remove the entry */
- 	g_debug ("CdDeviceDb: remove device %s", device_id);
--	statement1 = g_strdup_printf ("DELETE FROM devices WHERE "
--				     "device_id = '%s';",
-+	statement1 = sqlite3_mprintf ("DELETE FROM devices WHERE "
-+				     "device_id = '%q';",
- 				     device_id);
- 	rc = sqlite3_exec (ddb->priv->db, statement1, NULL, NULL, &error_msg);
- 	if (rc != SQLITE_OK) {
-@@ -246,8 +246,8 @@ cd_device_db_remove (CdDeviceDb *ddb,
- 		ret = FALSE;
- 		goto out;
- 	}
--	statement2 = g_strdup_printf ("DELETE FROM properties WHERE "
--				     "device_id = '%s';",
-+	statement2 = sqlite3_mprintf ("DELETE FROM properties WHERE "
-+				     "device_id = '%q';",
- 				     device_id);
- 	rc = sqlite3_exec (ddb->priv->db, statement2, NULL, NULL, &error_msg);
- 	if (rc != SQLITE_OK) {
-@@ -261,8 +261,8 @@ cd_device_db_remove (CdDeviceDb *ddb,
- 		goto out;
- 	}
- out:
--	g_free (statement1);
--	g_free (statement2);
-+	sqlite3_free (statement1);
-+	sqlite3_free (statement2);
- 	return ret;
- }
- 
-@@ -302,9 +302,9 @@ cd_device_db_get_property (CdDeviceDb *ddb,
- 	g_return_val_if_fail (ddb->priv->db != NULL, FALSE);
- 
- 	g_debug ("CdDeviceDb: get property %s for %s", property, device_id);
--	statement = g_strdup_printf ("SELECT value FROM properties WHERE "
--				     "device_id = '%s' AND "
--				     "property = '%s' LIMIT 1;",
-+	statement = sqlite3_mprintf ("SELECT value FROM properties WHERE "
-+				     "device_id = '%q' AND "
-+				     "property = '%q' LIMIT 1;",
- 				     device_id, property);
- 
- 	/* remove the entry */
-@@ -338,7 +338,7 @@ cd_device_db_get_property (CdDeviceDb *ddb,
- 	value = g_strdup (g_ptr_array_index (array_tmp, 0));
- out:
- 	g_ptr_array_unref (array_tmp);
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return value;
- }
- 
-@@ -360,7 +360,7 @@ cd_device_db_get_devices (CdDeviceDb *ddb,
- 
- 	/* get all the devices */
- 	g_debug ("CdDeviceDb: get devices");
--	statement = g_strdup_printf ("SELECT device_id FROM devices;");
-+	statement = sqlite3_mprintf ("SELECT device_id FROM devices;");
- 	array_tmp = g_ptr_array_new_with_free_func (g_free);
- 	rc = sqlite3_exec (ddb->priv->db,
- 			   statement,
-@@ -381,7 +381,7 @@ cd_device_db_get_devices (CdDeviceDb *ddb,
- 	array = g_ptr_array_ref (array_tmp);
- out:
- 	g_ptr_array_unref (array_tmp);
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return array;
- }
- 
-@@ -404,8 +404,8 @@ cd_device_db_get_properties (CdDeviceDb *ddb,
- 
- 	/* get all the devices */
- 	g_debug ("CdDeviceDb: get properties for device %s", device_id);
--	statement = g_strdup_printf ("SELECT property FROM properties "
--				     "WHERE device_id = '%s';",
-+	statement = sqlite3_mprintf ("SELECT property FROM properties "
-+				     "WHERE device_id = '%q';",
- 				     device_id);
- 	array_tmp = g_ptr_array_new_with_free_func (g_free);
- 	rc = sqlite3_exec (ddb->priv->db,
-@@ -427,7 +427,7 @@ cd_device_db_get_properties (CdDeviceDb *ddb,
- 	array = g_ptr_array_ref (array_tmp);
- out:
- 	g_ptr_array_unref (array_tmp);
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return array;
- }
- 
--- 
-1.7.8.rc3
-
diff --git a/x11-misc/colord/files/colord-0.1.14-sql-injections.patch b/x11-misc/colord/files/colord-0.1.14-sql-injections.patch
deleted file mode 100644
index 82b2c45d028c..000000000000
--- a/x11-misc/colord/files/colord-0.1.14-sql-injections.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 1fadd90afcb4bbc47513466ee9bb1e4a8632ac3b Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Mon, 14 Nov 2011 10:51:29 +0100
-Subject: [PATCH] Use sqlite3_mprintf() to avoid SQL injections
-
-https://bugs.freedesktop.org/show_bug.cgi?id=42904
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- src/cd-mapping-db.c |   36 ++++++++++++++++++------------------
- 1 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/src/cd-mapping-db.c b/src/cd-mapping-db.c
-index 6e1f4f3..e59a058 100644
---- a/src/cd-mapping-db.c
-+++ b/src/cd-mapping-db.c
-@@ -162,8 +162,8 @@ cd_mapping_db_add (CdMappingDb *mdb,
- 	g_debug ("CdMappingDb: add %s<=>%s",
- 		 device_id, profile_id);
- 	timestamp = g_get_real_time ();
--	statement = g_strdup_printf ("INSERT INTO mappings (device, profile, timestamp) "
--				     "VALUES ('%s', '%s', %"G_GINT64_FORMAT")",
-+	statement = sqlite3_mprintf ("INSERT INTO mappings (device, profile, timestamp) "
-+				     "VALUES ('%q', '%q', %"G_GINT64_FORMAT")",
- 				     device_id, profile_id, timestamp);
- 
- 	/* insert the entry */
-@@ -179,7 +179,7 @@ cd_mapping_db_add (CdMappingDb *mdb,
- 		goto out;
- 	}
- out:
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return ret;
- }
- /**
-@@ -203,8 +203,8 @@ cd_mapping_db_update_timestamp (CdMappingDb *mdb,
- 	g_debug ("CdMappingDb: update timestamp %s<=>%s",
- 		 device_id, profile_id);
- 	timestamp = g_get_real_time ();
--	statement = g_strdup_printf ("UPDATE mappings SET timestamp = %"G_GINT64_FORMAT
--				     " WHERE device = '%s' AND profile = '%s';",
-+	statement = sqlite3_mprintf ("UPDATE mappings SET timestamp = %"G_GINT64_FORMAT
-+				     " WHERE device = '%q' AND profile = '%q';",
- 				     timestamp, device_id, profile_id);
- 
- 	/* update the entry */
-@@ -220,7 +220,7 @@ cd_mapping_db_update_timestamp (CdMappingDb *mdb,
- 		goto out;
- 	}
- out:
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return ret;
- }
- 
-@@ -242,8 +242,8 @@ cd_mapping_db_remove (CdMappingDb *mdb,
- 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
- 
- 	g_debug ("CdMappingDb: remove %s<=>%s", device_id, profile_id);
--	statement = g_strdup_printf ("DELETE FROM mappings WHERE "
--				     "device = '%s' AND profile = '%s';",
-+	statement = sqlite3_mprintf ("DELETE FROM mappings WHERE "
-+				     "device = '%q' AND profile = '%q';",
- 				     device_id, profile_id);
- 
- 	/* remove the entry */
-@@ -259,7 +259,7 @@ cd_mapping_db_remove (CdMappingDb *mdb,
- 		goto out;
- 	}
- out:
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return ret;
- }
- 
-@@ -301,8 +301,8 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
- 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
- 
- 	g_debug ("CdMappingDb: get profiles for %s", device_id);
--	statement = g_strdup_printf ("SELECT profile FROM mappings WHERE "
--				     "device = '%s' ORDER BY timestamp ASC;", device_id);
-+	statement = sqlite3_mprintf ("SELECT profile FROM mappings WHERE "
-+				     "device = '%q' ORDER BY timestamp ASC;", device_id);
- 
- 	/* remove the entry */
- 	array_tmp = g_ptr_array_new_with_free_func (g_free);
-@@ -325,7 +325,7 @@ cd_mapping_db_get_profiles (CdMappingDb *mdb,
- 	array = g_ptr_array_ref (array_tmp);
- out:
- 	g_ptr_array_unref (array_tmp);
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return array;
- }
- 
-@@ -350,8 +350,8 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
- 	g_return_val_if_fail (mdb->priv->db != NULL, FALSE);
- 
- 	g_debug ("CdMappingDb: get devices for %s", profile_id);
--	statement = g_strdup_printf ("SELECT device FROM mappings WHERE "
--				     "profile = '%s' ORDER BY timestamp ASC;", profile_id);
-+	statement = sqlite3_mprintf ("SELECT device FROM mappings WHERE "
-+				     "profile = '%q' ORDER BY timestamp ASC;", profile_id);
- 
- 	/* remove the entry */
- 	array_tmp = g_ptr_array_new_with_free_func (g_free);
-@@ -374,7 +374,7 @@ cd_mapping_db_get_devices (CdMappingDb *mdb,
- 	array = g_ptr_array_ref (array_tmp);
- out:
- 	g_ptr_array_unref (array_tmp);
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return array;
- }
- 
-@@ -416,8 +416,8 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
- 
- 	g_debug ("CdMappingDb: get checksum for %s<->%s",
- 		 device_id, profile_id);
--	statement = g_strdup_printf ("SELECT timestamp FROM mappings WHERE "
--				     "device = '%s' AND profile = '%s' "
-+	statement = sqlite3_mprintf ("SELECT timestamp FROM mappings WHERE "
-+				     "device = '%q' AND profile = '%q' "
- 				     "LIMIT 1;", device_id, profile_id);
- 
- 	/* query the checksum */
-@@ -436,7 +436,7 @@ cd_mapping_db_get_timestamp (CdMappingDb *mdb,
- 		goto out;
- 	}
- out:
--	g_free (statement);
-+	sqlite3_free (statement);
- 	return timestamp;
- }
- 
--- 
-1.7.8.rc3
-
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index e5965187cae8..15d39cd59c97 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support in drivers;
-			required for some colorimeter models, e.g. ColorHug</flag>
+		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
+			colorimeter drivers</flag>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
 		<flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>