Version bump, drop old, collides with old colohug-client versions (#520936 by flameeyes)

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 39 insertions, 25 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 98a290a878c6..30a421925551 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.83 2014/08/14 12:40:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.84 2014/09/07 14:05:55 pacho Exp $
+
+*colord-1.2.2 (07 Sep 2014)
+
+  07 Sep 2014; Pacho Ramos <pacho@gentoo.org> +colord-1.2.2.ebuild,
+  -colord-1.0.3.ebuild:
+  Version bump, drop old, collides with old colohug-client versions (#520936 by
+  flameeyes)
 
   14 Aug 2014; Jeroen Roovers <jer@gentoo.org> colord-1.2.1-r1.ebuild:
   Stable for HPPA (bug #517804).
diff --git a/x11-misc/colord/colord-1.0.3.ebuild b/x11-misc/colord/colord-1.2.2.ebuild
index c6316fbda038..967336e7ba9f 100644
--- a/x11-misc/colord/colord-1.0.3.ebuild
+++ b/x11-misc/colord/colord-1.2.2.ebuild
@@ -1,42 +1,50 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.0.3.ebuild,v 1.10 2014/07/30 19:22:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.2.ebuild,v 1.1 2014/09/07 14:05:55 pacho Exp $
 
 EAPI="5"
-VALA_MIN_API_VERSION="0.18"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
 
-inherit bash-completion-r1 check-reqs eutils user systemd base udev vala
+inherit bash-completion-r1 check-reqs eutils gnome2 user systemd 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/1" # subslot = libcolord soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="examples extra-print-profiles +gusb +introspection scanner systemd +udev vala"
+SLOT="0/2" # subslot = libcolord soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+# We prefer policykit enabled by default, bug #448058
+IUSE="examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
 REQUIRED_USE="
 	gusb? ( udev )
 	scanner? ( udev )
-	vala? ( introspection )"
+	vala? ( introspection )
+"
 
 COMMON_DEPEND="
 	dev-db/sqlite:3=
-	>=dev-libs/glib-2.32.0:2
-	>=media-libs/lcms-2.5:2=
-	>=sys-auth/polkit-0.103
+	>=dev-libs/glib-2.36:2
+	>=media-libs/lcms-2.6:2=
 	gusb? ( >=dev-libs/libgusb-0.1.1[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+	policykit? ( >=sys-auth/polkit-0.103 )
 	scanner? ( media-gfx/sane-backends )
 	systemd? ( >=sys-apps/systemd-44:0= )
 	udev? (
-		virtual/libudev:=
-		virtual/libgudev:=
 		virtual/udev
-		)"
+		virtual/libgudev:=
+		virtual/libudev:=
+		)
+"
 RDEPEND="${COMMON_DEPEND}
-	!media-gfx/shared-color-profiles"
+	!media-gfx/shared-color-profiles
+	!<=media-gfx/colorhug-client-0.1.13
+"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.9
@@ -44,7 +52,8 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )"
+	vala? ( $(vala_depend) )
+"
 
 # FIXME: needs pre-installed dbus service files
 RESTRICT="test"
@@ -65,18 +74,17 @@ pkg_setup() {
 
 src_prepare() {
 	use vala && vala_src_prepare
+	gnome2_src_prepare
 }
 
 src_configure() {
 	# Reverse tools require gusb
 	# bash-completion test does not work on gentoo
-	econf \
+	gnome2_src_configure \
 		--disable-bash-completion \
 		--disable-examples \
-		--disable-gtk-doc \
 		--disable-static \
-		--disable-volume-search \
-		--enable-polkit \
+		--enable-libcolordcompat \
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
 		$(use_enable extra-print-profiles print-profiles) \
@@ -84,17 +92,18 @@ src_configure() {
 		$(use_enable gusb) \
 		$(use_enable gusb reverse) \
 		$(use_enable introspection) \
+		$(use_enable policykit polkit) \
 		$(use_enable scanner sane) \
 		$(use_enable systemd systemd-login) \
-		$(use_enable udev gudev) \
+		$(use_enable udev) \
 		--with-udevrulesdir="$(get_udevdir)"/rules.d \
 		$(use_enable vala) \
 		"$(systemd_with_unitdir)"
 }
 
 src_install() {
-	DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
-	default
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
+	gnome2_src_install
 
 	newbashcomp data/colormgr colormgr
 	rm -vr "${ED}etc/bash_completion.d"
@@ -108,6 +117,4 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.c
 	fi
-
-	prune_libtool_files --modules
 }