Version bump with various improvements and bugfixes; shared-color-profiles has now been merged into colord. Drop old.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 59 insertions, 195 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 7f142d71a352..59f4b21759c2 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.52 2013/01/20 17:08:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.53 2013/01/22 07:23:43 tetromino Exp $
+
+*colord-0.1.28 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/colord-0.1.11-fix-automagic-vala.patch,
+  -files/colord-0.1.15-fix-automagic-libgusb.patch, -colord-0.1.21.ebuild,
+  -colord-0.1.23.ebuild, +colord-0.1.28.ebuild, metadata.xml:
+  Version bump with various improvements and bugfixes; shared-color-profiles
+  has now been merged into colord. Drop old.
 
   20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> colord-0.1.26.ebuild:
   Stable for alpha, wrt bug #449744
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 89f5131c74da..f70e251afd06 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,12 +1,22 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX colord-0.1.26-fix-automagic-systemd.patch 1615 SHA256 dc1d206b3908b3c3a3b7e45c5fcf49ac82093ef0d1d2d9e62321d5e85a7662ba SHA512 636cd8de6c84f59fb31d82479acc63a99fa1e61dddd61dccb8029ecd64ab492472b319fbdb33cd2b30bbbd7d6f4a1efca03e5746e8974b63d94add21282b5c80 WHIRLPOOL 85f6483cde491ccbd23944f18947c73100751c074b37132bf008c0a1e65367bf83ecd2059a7332e69ad38284d67408c549fcaa1b7905a750b3a081119dc16bef
-DIST colord-0.1.21.tar.xz 553424 SHA256 360b896b0d2a35970a0cd42e448ea327d789f309ff95022190c4d33bb8b02c30 SHA512 442ef53b73466da34c3a2ad455ae4e401d6640a8093febdbb28adcda5908fcf5a043653b44f9357d02945230e3bee3f75f3e9e4d622b85adc8ebf4f5c8735537 WHIRLPOOL 91860610b7117c1a5f984f4bf778033438905a16a2f93c699be3774b6acd21c5947eb475ce83570cddde2bd5795d4e5427e8a10bc97c6438f67d7b68586800b1
-DIST colord-0.1.23.tar.xz 547392 SHA256 e0e9da36e28b3f977ce32accdc5cbac415ac2575031377c63b1e7bd2af32d789 SHA512 31018c0f42b8f0ab112163a621cfa02cabea27ded70ef9e15470241430f9bb017c56c4ab3992a1ba238db59f0a80f49d62f096c66af9866894a0bf3f35861ffb WHIRLPOOL f5600323527b891e8392e9c52d781144282e5fdc7f2b8a9fd4b99c1556b76f19d74175e3f7c7b9e42214a6548c3a8224fa40e84cd38b20b628c985e58fc42cc6
 DIST colord-0.1.26.tar.xz 638008 SHA256 6e581413813b96ab3efb4549f3a1260a1522f472aa0ee7f3dda9146bece2d7d3 SHA512 cfa26311ded52ebd52583434a5cf02656e26783c4160741ee85766b343975adf088e1e7717f3f81e402c6396a824554e0e214ba1bfaafdc907a350b0f9e72c8f WHIRLPOOL f5f32305671bab6f63ef5b7a754c07fd3b35de18d258473c89ce83acd4cac69ba73fcf3870de8b067c445b9d5fade59631f6e9c892e2044472e2dcc2b1c511ea
-EBUILD colord-0.1.21.ebuild 2671 SHA256 bf3fc7c8389220b3d163aa6afe04947efc1c5518288d9b91813d5822a8b87d1c SHA512 09f6e49258261d292cfc697704b616605a62da918f3881042fb8414263e995adc5f46344e62317abb1761951c4df7d8eb6709669e272ecc98ccf0d83661ce93e WHIRLPOOL ba6eb4e846cc00a3234e1f5f445978d217781914cdfe19a229e4bd4f7bfe93c09c71707742477e8f929abb212569f6d89492da827e8ad7a6e042dcaedb34aecd
-EBUILD colord-0.1.23.ebuild 2884 SHA256 8a6f2463ad750773c517181479b2088855f51b495c0f51b74115a1e00af01324 SHA512 dd590d3bafc0c8b1465d56a3f4b158f6d67db10cd01b74e3c2b912d960fe637b19a7d376318d8893824719d80d1a4ea0c2f608e302fa14f72831a64d34208907 WHIRLPOOL 1daccd9e6e0f18a365ad514004b52358679552f8f00fb2ede5efeacfb419d512d2da79635f5fc7abe73530afb68033248a0b8266f59cee1cee4a83e0bd5cb45f
+DIST colord-0.1.28.tar.xz 861072 SHA256 b165be944eb60aedb3e16d04336643dd9b4945d034c899473583b5a44b9cbcdd SHA512 4714cfea4024c1c7c9781884a9bdbdf3b20696055053ce6432371366520c44e80f96db0a85549524772965decfc71834704782b50cf7d6b5a446babd25b141d8 WHIRLPOOL e24d22c9e04c70e36c055ddd1b45416aea822d9aeb7ef950155a010bad810b16afea28e77d42e87e97da44089c3ece46303a4c01887c112b699da0641c050c50
 EBUILD colord-0.1.26-r1.ebuild 2691 SHA256 46b8ac3737e2983405dad5b5d3c3013618d055f166da9b99b89619c825bd5459 SHA512 176f7df4d5b6cf5c244beb6d0a619a388e6eca79f692bf3a1bd19136ccb3e805416b046e548750cdda27c39f6b333a7cf859b4f19110dea846679dec76ecc02d WHIRLPOOL b136e49688c09784954cd6be80b8b2cfcabff9f28ce1b1585c33aebe1f72793852fb2ff749e44ef891cc5b19d0f46a63d004ab0a4ed4adf967c2f04250ef57ab
 EBUILD colord-0.1.26.ebuild 2710 SHA256 71b7b85547146278b29218cd9191ba90f36e87bd85fb98f1e60cd0ffbda06bd2 SHA512 a9012fc310dbcdb0a38a4741084bf9a9cfbc98bb601b34f6d31b307c114e21cd86e69a7cb2ca6282c1f54b7e3d39bfa2fd6f8badc90a88575809089ec51f2859 WHIRLPOOL 324bdedd78f8d4e1aaffd8659f892c5606fb9a058e10e14bbae4a152bdbe27d26243110c1d11f447a980632173d2edea4e97733397659e010f853d154fd25770
-MISC ChangeLog 9293 SHA256 bf5389e03b86b1c9e7c0260550c839cf63c74256d3274cac217e9c4ec7f32dc1 SHA512 892a432aaea30e0ccdd553ecdc095e5185a5103bbeb01bbada64d17d4bee1bd1806e7b37fc97afb166ef6ed86605585b6a93830cb38c4ad9b380491398b3590a WHIRLPOOL 0b14969c3a2b3aac7366ed374922ea54cf378d77003540bb2926c907904534b7ca3c7c126e6d2d2f5f7a0b79ad744ac584438c39abf20c9405b7d28c0acddfbd
-MISC metadata.xml 353 SHA256 d7e364dcc2705b74624c797af272d796eae7cdc1d864a9f33add7c418f5444a9 SHA512 b4708d6b2d83f86b1b46f9efaccec4eb0d70f4e7b6b90be9504461e0255bdee26853c7d052d8f15c863e739710c5b1257083fa9b619d877cfc0858abec759fa7 WHIRLPOOL 66075ea5e3899fa40043c83bf7c42faec941cedc6dd599cf216f565b3b575721d06e2f7851db602522c8d1bcfd2904ebe2709958ef3da2b50b19a12de1d0126d
+EBUILD colord-0.1.28.ebuild 3149 SHA256 73f4716ff3a0ec1cc86d7d574856156593ce9a785a88416adfc519c63af4bf13 SHA512 2ed081efaf4370e80acf370a615a14f6086ad60580a4c00608f370c81615c48b246813f084c918b2005a12ad1efb15a4556bba0f50f268360ffe55a9ff904390 WHIRLPOOL 290b562b1c59cba5eaea79631e4a899bc4beaef8a27c37a2faa7800a27f4285a0cbbbc76a0552834cfb7fb753cfc4d11af2660498be594248f816429cf0bbf8a
+MISC ChangeLog 9697 SHA256 d7970815fda139627a63f782cc12af6896884c109824092d14caf7d12b44cf28 SHA512 d671fa26317ebc98ed01ab6a9c169a5899e7f92f864d36ba1e099451805d6b0e55fc8f72cc241260734961ff446b61b8c50f33d5e4f81ab47152435b0bb6477f WHIRLPOOL c3b928298bd5189c4cf2c30d3c5169be3bfa1de30f27867bb04ee175a3e89a73486f1cb19dbacaa8b9221a1ac840caeff4c5de9e3ca39b33873852272ceb4849
+MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ/j6HAAoJEJ0WA1zPCt1hbCIIAJr9czEVdXm4y0nyXR6o9O/S
+L8qwtFl8FMH209mhkWMj9LmQYXQdzqAV9vfpCrO9IqoOy5I8XFJKwALyqUnAhwb7
+tUmGWav6dpfUcbrMQxmtFLMo7LGxcxfmSXo4xOdHi+PJVnzToQqfYcVa3Xk8OH88
+hF5dyH8fYqQPbd2OyxMcilW6U+4rqbOqoRoIu0KHVdnG6HoMgxo9ev5xsow46R1o
+vXu+2n2gtgzcE+bNbrvK1tdIXdEr4/QD7cFf3H8xobqFEKO10g2FLSNfxYAwqOMR
+sm5L8bA1u1HyJUHXGjl0WNXvDYQjljdsxNGQ2sOElX9D8IyUAdH3thlDtBPaAiM=
+=G4ae
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-0.1.21.ebuild b/x11-misc/colord/colord-0.1.21.ebuild
deleted file mode 100644
index 6a21fcbd658f..000000000000
--- a/x11-misc/colord/colord-0.1.21.ebuild
+++ /dev/null
@@ -1,102 +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.21.ebuild,v 1.11 2012/12/31 18:12:03 ago Exp $
-
-EAPI="4"
-
-inherit autotools bash-completion-r1 eutils user 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="~alpha amd64 arm ~ia64 ~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? ( virtual/udev[gudev] )
-"
-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() {
-	base_src_install
-
-	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
-
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/x11-misc/colord/colord-0.1.23.ebuild b/x11-misc/colord/colord-0.1.28.ebuild
index 9b779ecab796..43a71cf85666 100644
--- a/x11-misc/colord/colord-0.1.23.ebuild
+++ b/x11-misc/colord/colord-0.1.28.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.23.ebuild,v 1.4 2012/12/20 05:29:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.28.ebuild,v 1.1 2013/01/22 07:23:43 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools bash-completion-r1 eutils user systemd base toolchain-funcs vala
+inherit autotools bash-completion-r1 check-reqs eutils user systemd base udev vala
 
 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 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc examples +gusb +introspection scanner +udev vala"
+SLOT="0/1" # subslot = libcolord soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples extra-print-profiles +gusb +introspection systemd +udev vala"
 REQUIRED_USE="vala? ( introspection )"
 
 COMMON_DEPEND="
-	dev-db/sqlite:3
+	dev-db/sqlite:3=
 	>=dev-libs/glib-2.28.0:2
-	>=media-libs/lcms-2.2:2
+	>=media-libs/lcms-2.2:2=
 	>=sys-auth/polkit-0.103
 	gusb? ( >=dev-libs/libgusb-0.1.1 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-	scanner? ( media-gfx/sane-backends )
-	udev? ( virtual/udev[gudev] )"
+	systemd? ( >=sys-apps/systemd-44 )
+	udev? ( virtual/udev:=[gudev] )"
 RDEPEND="${COMMON_DEPEND}
-	media-gfx/shared-color-profiles"
+	!media-gfx/shared-color-profiles"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35
@@ -37,14 +37,22 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.9 )
+	extra-print-profiles? ( media-gfx/argyllcms )
 	vala? ( $(vala_depend) )"
 
 # FIXME: needs pre-installed dbus service files
 RESTRICT="test"
 
-DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+# According to upstream comment in colord.spec.in, building the extra print
+# profiles requires >=4G of memory
+CHECKREQS_MEMORY="4G"
+
+pkg_pretend() {
+	use extra-print-profiles && check-reqs_pkg_pretend
+}
 
 pkg_setup() {
+	use extra-print-profiles && check-reqs_pkg_setup
 	enewgroup colord
 	enewuser colord -1 -1 /var/lib/colord colord
 }
@@ -52,12 +60,7 @@ pkg_setup() {
 src_prepare() {
 	use vala && vala_src_prepare
 
-	# https://bugs.freedesktop.org/show_bug.cgi?id=55464
-	epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
-
-	# https://bugs.freedesktop.org/show_bug.cgi?id=55465
-	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
-
+	epatch "${FILESDIR}/${PN}-0.1.26-fix-automagic-systemd.patch"
 	eautoreconf
 }
 
@@ -71,11 +74,14 @@ src_configure() {
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
 		$(use_enable doc gtk-doc) \
+		$(use_enable extra-print-profiles print-profiles) \
+		$(usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") \
 		$(use_enable gusb) \
 		$(use_enable gusb reverse) \
 		$(use_enable introspection) \
-		$(use_enable scanner sane) \
+		$(use_enable systemd libsystemd-login) \
 		$(use_enable udev gudev) \
+		--with-udevrulesdir="$(udev_get_udevdir)"/rules.d \
 		$(use_enable vala) \
 		"$(systemd_with_unitdir)"
 
@@ -84,10 +90,8 @@ src_configure() {
 }
 
 src_install() {
-	local udevdir=/lib/udev
-	use udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
-	base_src_install udevrulesdir="${udevdir}"/rules.d
+	DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
+	default
 
 	newbashcomp client/colormgr-completion.bash colormgr
 	rm -vr "${ED}etc/bash_completion.d"
@@ -102,5 +106,5 @@ src_install() {
 		doins examples/*.c
 	fi
 
-	prune_libtool_files --all
+	prune_libtool_files --modules
 }
diff --git a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch b/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch
deleted file mode 100644
index 6f33190421fd..000000000000
--- a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur colord-0.1.11//configure.ac colord-0.1.11.new//configure.ac
---- colord-0.1.11//configure.ac	2011-08-01 14:25:25.000000000 +0530
-+++ colord-0.1.11.new//configure.ac	2011-08-14 18:55:45.560334275 +0530
-@@ -218,8 +218,10 @@
- dnl ---------------------------------------------------------------------------
- dnl - Build VALA support
- dnl ---------------------------------------------------------------------------
--if test x$found_introspection != xno; then
-+AC_ARG_ENABLE(vala, AS_HELP_STRING([--enable-vala],[build vala bindings]),
-+	      enable_vala=$enableval,enable_vala=no)
-+if test x$found_introspection != xno -a x$enable_vala != xno; then
-	AC_PATH_PROG([VAPIGEN], [vapigen], [])
- 	if test "x$VAPIGEN" = "x"; then
- 		has_vapigen="no"
- 		AC_MSG_WARN([vapigen not found, will not build Vala binding])
-@@ -228,7 +230,9 @@
- 	fi
- else
- 	has_vapigen="no"
--	AC_MSG_WARN([Not introspection found, will not build Vala binding])
-+	if test x$found_introspection = xno; then
-+		AC_MSG_WARN([introspection not found, will not build Vala binding])
-+	fi
- fi
- AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"])
- 
diff --git a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
deleted file mode 100644
index 8c7e93366dd5..000000000000
--- a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From db63bbbe6a3d925644401ba001b8e84a84d19369 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 27 Nov 2011 01:33:55 -0500
-Subject: [PATCH] Make libgusb dependency non-automagic
-
----
- configure.ac |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4732921..65abf67 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,11 +126,13 @@ dnl ---------------------------------------------------------------------------
- dnl - Check library dependencies
- dnl ---------------------------------------------------------------------------
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
--PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1, have_gusb=yes, have_gusb=no)
--if test x$have_gusb = xyes; then
-+AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
-+	      enable_gusb=$enableval, enable_gusb=yes)
-+if test x$enable_gusb != xno; then
-+	PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1)
- 	AC_DEFINE(HAVE_GUSB,1,[whether gusb is available])
- fi
--AM_CONDITIONAL(HAVE_GUSB, test x$have_gusb = xyes)
-+AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes)
- 
- PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, has_new_lcms=yes, has_new_lcms=no)
- if test x$has_new_lcms = xyes; then
--- 
-1.7.8.rc3
-
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 62dd805cde5a..5954305aab6b 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
+		<flag name="extra-print-profiles">Generate extra print profiles.
+			Warning: significant build time and memory requirements.</flag>
 		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, needed for
 			colorimeter drivers</flag>
 		<flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>