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

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 45 insertions, 31 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/Manifest b/x11-misc/colord/Manifest
index f0a44ad7a428..7ff97134b91d 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST colord-1.0.3.tar.xz 1082868 SHA256 b4292ad5640135a2a1b773bffe0d94bc83abccc72c7fc8cf6407e7e7b25286d7 SHA512 9f187897411a67760738817414be028e4b188e102d3cd5a11c2082b92bb8b45b5875d3c385a9bdc954853406e431dafc0d7f8af184656ad934e3e7f650f9aa2e WHIRLPOOL dcee5d0bd63bee191bc9cc384f3fc0979009ee765a3c5bb8e1c1e43bc763ef8a55dc9eb6248e91b9f5d2857aa0db1aa3cd0f59bf38e76671ffd60c3ef32b3fc1
 DIST colord-1.2.1.tar.xz 1164544 SHA256 2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea SHA512 a0f6756f1f30a671ab723286cab445394c90013c5da6689786d91e28b6b272fa3cbb6afccf55af3b643890092187fc9ef0500a469ece8c16f7afc1b2b018ca03 WHIRLPOOL c3e00b89f4b8b720f2997e3b530b7b2db932c1cbeba98ce453c48e84f9768cade09f73a7fe9a8b1dbef0ed3f35362b652a535b09846b8b1eef53985e05467e5e
-EBUILD colord-1.0.3.ebuild 3154 SHA256 605257955e2b45270c3f8e7197089aab26d0d65b07b79cb737f84103f07cda9e SHA512 7ac5d115545f2d887acc91fc283efdcaa6d7eb0665c093a6eb790f52980f27f82a6800b7cbb7692803fcf17ec8648a4139ed2559732f809eee68b81b5d312373 WHIRLPOOL 2f481e2f6487d81e33768e31df288a7ea28bfae5737d337d8258ffe8099bb1884a234a34d7d6c41f6a3a49ebe66b69380d2fafde6fb07491bd5c0f6046adf4ea
+DIST colord-1.2.2.tar.xz 1176008 SHA256 d9059710321a231657932dd9f824a0cd5b71f90e2812c219f336ee1693066529 SHA512 0edf48de8f64f8df5300c8cb0fab64f1832cc7908b7bb347d59d9de4bb86866dc26030510ee149dc581338df01194af3947ca34909c8a560a08d33acffda6a2c WHIRLPOOL 6f12f85e30aff239bd57c1b0a28779bf729a2c17bb67c0d705cdb865d0deff4e507ffa527ed6bfe62fa4f67771a7ec7917a88175dc239df1626fc7f0058deafe
 EBUILD colord-1.2.1-r1.ebuild 3283 SHA256 a60aa2b91abc9166aa86b2ca35495e29014d5d3051ce1fb0ece6420c06bd727c SHA512 7abbcfad537aee8e65a02890f40b601854bd471ad281129555b2fa83cd7423c79c8dfc290ff762e510a16ab78bf6e20e6ace033161fbe0bc856aabaf94562a0b WHIRLPOOL 1771d403e72e6a9b6c2145dc943b0025e9b9336f2dde8794686e4a891d5af6cc2a18b830e0afa66f1d3f6e07e43492b38e839537f163069567c35f841eeed95e
-MISC ChangeLog 13656 SHA256 5c5cc214c1299bffc70e2f3d8a63dd7f363c1f1ff0b66c39a094320323d8b07c SHA512 c77b15e225ce41095777a8a49185c96a5f2df6296b381cc8ab843b5091736ca3ae2895937071fd58f8eff327a4db43f03dc731ea378697d0ea143e1537855f3f WHIRLPOOL 200a0e8677c6375546af4fb196d21bf53224133dff1b90c3e1647713d40dfc6cac10bc92338321d327286c44a9c8b3f1407bf6c38367a56a9fb0c30ebb30ffcd
+EBUILD colord-1.2.2.ebuild 3322 SHA256 e297f82ecd1b3b5d8afd6d7af1c2527db215bc36e6ffc27f56a37392c16cb857 SHA512 9b0d80e1bf9ccb1a115c18bb6184f8495a4594345d0653f6c43704c2c229961a1fe9ec97d1ffdaaba63b0a25b4afd083085d649aa4864a1918d9a0a49b2c1d89 WHIRLPOOL e2a26a68524b30467638518f7447e13e4e01f3d0160e4848672f647be0bef8deed5411ca271d1d2289d3cf1ad9cfb484ef99294e8ac463ad23ca7c061fc97e20
+MISC ChangeLog 13873 SHA256 d9d8814e9e4f160dcb25491c14ea67e7d2cd2e7ed1a133994f3da41e187a7f66 SHA512 a9a813d1a3db2c207aa492cd8de444a809fb38ab9a1ae80d15f85d6969fdd37dd462aadc20d7b228d7743d714cf22fbcb239d5ca7a3ca07f5838200a20e47011 WHIRLPOOL 80384c1aee8058810209b16b235e6e8f0c3006052bdc969a7d4a39edb14e1922f6e40a3a7a0ee2891054fee4fd04f1748ccb200864b590a72f8f6ebb28c542e5
 MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPsrkcACgkQVWmRsqeSphM34ACeKnJZ5cyNO/PHy1Ho/yvyhWgA
-lV4An1rCXix6jWI+dw3zDymKomffExEo
-=i7b9
+iEYEAREIAAYFAlQMZkQACgkQCaWpQKGI+9TlMACfeZhba8x+uXRuH34hEsHZtMiN
+ofYAnjwvCjm6wW2zxjVzFhLOFRGHB4Wr
+=Mmh/
 -----END PGP SIGNATURE-----
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
 }