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

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

6 files changed, 41 insertions, 187 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/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>