Version bump, drop old

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

4 files changed, 185 insertions, 143 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 21553991acc0..2a72c4079bdb 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.99 2015/03/29 18:19:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.100 2015/06/07 14:24:09 pacho Exp $
+
+*colord-1.2.10 (07 Jun 2015)
+
+  07 Jun 2015; Pacho Ramos <pacho@gentoo.org> +colord-1.2.10.ebuild,
+  -colord-1.2.5.ebuild:
+  Version bump, drop old
 
   29 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
   -colord-1.2.5-r1.ebuild, -colord-1.2.8.ebuild, colord-1.2.9.ebuild:
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 2326ca9fdad7..aa476dc55e70 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST colord-1.2.5.tar.xz 1181220 SHA256 0332420c7fd808bb3a028e0249fb2b5e52b9544330c767d08b01a6e03d3c5283 SHA512 61a40856fff11361c94c2798e99dde6376a7f43bc3e67f1d7b83f7aaba872e08b4e8e25cacd8b54b1ac191b7bd33b08068e70e780e41e06bcab6bba8c7651805 WHIRLPOOL be40dd210d7de04763c12b0cf4a18b152b14d983e271fd3a15b9bf6320f7a542346c1c2e656bb4293ce4133a2fff14b0448df25882cd4f7e95187f43b22e1fc5
+DIST colord-1.2.10.tar.xz 1203248 SHA256 1dea0453cc778326e700f6cb0a206836a57dedfb0fbdc3acaf2be02ea77a963a SHA512 fdf6f41e84fb37905e3c2e37a7d095d5271759f17e292cf5cf23f846ea6805949185c1a0548c4c4e24e2a385e655cd30609423921b0389076f5373ca1b8578e7 WHIRLPOOL d70fd0d3fde030f6c592f49ae146ccbb38c00ad0c28e2253ea8e2e00436c19fc4cf53aead6360e04eb7509a8d94bd07ffab6dde5592fd050dd37de3355b76f87
 DIST colord-1.2.9.tar.xz 1200936 SHA256 48ce0db4f327c94c2bec11fed98a9a73f580d34c6edcd636d90831fe3bea5ae4 SHA512 d25497fa6460e5ffd7ce872bf16b60916e879cdd3aaec4c81dd4ab8446949767f3d3d49a3e654813445b049a9653334ba22d8e9a91cf6699c6063c01be382a75 WHIRLPOOL ca8edc19b162e4e97c263c1bc64d2a655d5adafeb2cb64c8bdbd7eb4e20052ce76f8ad332168088a97e654d20f0c5215d62829fed7471ac69faed3a79fc9f283
-EBUILD colord-1.2.5.ebuild 3424 SHA256 5cd8c14ac5bc0ed63ae64c756f94c75e7b860067526a56b22b5dc447cebcbfdf SHA512 593e246b123e4a7f36bf062f31e54dec9af7d4105554e148e105747d3b24b71ef8f2ba4cdfb39216dd47af3351a10983e7e9a1d2c8fa9f0018e73afc2be91bd4 WHIRLPOOL 151b4f82c83ca623552fb3f61b5703802de4b68c37cbc40f2bd8fa8bcfb8bb16b5dc9627c7bcd2abe68c90c4a04568aadd9c1a149950666a1744eef61314f87b
+EBUILD colord-1.2.10.ebuild 4575 SHA256 20414f588d90764c8d7e8a7295afe54f35106972c516ac16e84bc43f5bd7d207 SHA512 daa4efd953ae4bf1633d407af56f730a8a59affcf4be19844781b292221067aa832f4322c268096ddc229eb295d3010dfe51bb5fe0dd617eb525ffb5f5c2ec5b WHIRLPOOL e94dac1eb5b584269b74a1897ca1a595838790da7087379b3c74ae3547fae5963f021d8f5d11b7ffb51294873da23e842fd6f006955845eee573064b2649e469
 EBUILD colord-1.2.9.ebuild 4601 SHA256 b7e531259edde09be4880ffc6e03c4d4d3a070ac0a67182571a8680b961a8e93 SHA512 32a22d34bc3eadee2cd2b9d4040e701919c2ba3bf445f3a5eff2885ac39d8e57a77656ff7dcdbbfd5f69f6725418571bf31cd80f6d3f10e90b98fb502d50a1b9 WHIRLPOOL f4ebdb3c34d1b8f642343d6e0fbc96c4523bdf26700a7694ea98a79d159771497f12df0743d96e20e858d6edb63e43a2f44c26f72ab429a556c399bc03538eff
-MISC ChangeLog 15841 SHA256 7285f59bda970f5dcc60840c882b71047489a2ea293d6a420db4f72f4f45e386 SHA512 c7beb6a11283152ad4b6ad90f9e0fa029dc5a07eadde31920c8285ceb86328d903f411c3da0d02e35cc9f86d34f151abde94728bf4a0484f0c2b8c38720a0fa2 WHIRLPOOL 21debc6092153a56e912a38678747fea1e3ae1739a860f68ebcfb287a25e9892cca09d675f5102e7ac985e4497c30d517125c818f473febabd3361bd38df929a
+MISC ChangeLog 15987 SHA256 19080dfc723f946d2a594f6d81efdaaed6ddb655f6e758aabdf7613905fc6add SHA512 92b75e812f0b375f68bfb00c50a0e0ff60b46fd92c5cf38ad2e2e5b6f770cd9c5eacbd6f10cec4b40e7e3945a8c07550f9c8f1249c9cb69104b7c38d3681b068 WHIRLPOOL 776708f7343cf0c0e02b74b8a2b057a71e05130a97a4042451ecc9d5d22b1b5a146695891e0ba690bbc3d58f18b0a5ae605297874b98db57ff342dc2b0ba5a13
 MISC metadata.xml 469 SHA256 a36a9a3cb4c04c78da19f50b10a9222e6f56b0488e5dde38849a94466992924b SHA512 2e9539600b4d8071a240ea6163981673891adfceb377d449262a7c9d70bd0f9753a19b5b5cb119b6d068e2144cb425b61112fccb8823b0f19091e7ebc456f853 WHIRLPOOL ec5ca6e8fa9f9c78000c666f71dcf34af02d8961d3064da9262e9c6886867bf93490fda36ec9c3c6d35eed62349d4cce6fb4f4dd5577e04ace056640f7e70917
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVGEIvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNtewP/3TpZw3dS2J0O27U+28xp7b9
-zrgpArDuWDSGYZZSUAbJ2botSd+G1DY8f8yhwsQrAxYQJlasHcZc++y9zK7V8bbE
-EFjKGWQHfPzwZHYhB0AtklSiOE+QZQ4DDVsC1qLlIHcdE51Yvf3GOi+ibFIstttN
-94pNj+nwbnK5NBbUaTiB9Z7wv2jgqnIkhuxIeIDHITXLXfW6lobdaZtxVibl3vsd
-Ot/Sa4HEIF5oNuvwm+Y+7FHsegv0VGnEPgC79OGHVe2RdLhl137bGo3Mj2l/+5NA
-84odVp6nHQD+PKDScdN1cG6xxqPvS7z58+5NJFbrGF2EMs6JE+9V0UpIH2ltKf7L
-1Q9yMtjtgHnDWDvXX4pjt6c/Sh5amuQwKCi7F/TLSYQAU2yKjFqSnWyqRU4WEaki
-LciQnskyNZKEPZe51XBLZemkvvdlvCkMOfDQv3FPIuu71gIwNMWZYDSR+dclj0qZ
-xU0gzTwSkvopoxnb9A4aSON1C6ZZA0A0QbYzyZQnKu48LPfzwiAq/jyIUolCJi4x
-/M/5n+mctBOWgklhUqr5gFX+4GA9GYRJCUXRoH/eqA4Ji2iiO0lmzSKWIff6nzYt
-Te/oPgKHXxTfoPEO4ILeuBUdQSfsd9xsCTWVmS90bC1h7HQiusS37CUnAaOPOHDp
-K/AfUQ8oHBxjv/BxqCy/
-=XBpy
+iEYEAREIAAYFAlV0VAoACgkQCaWpQKGI+9ScWgCfR3L8xt8a8kyczVWbrUimFbDh
+Gd4AnRjMLETXc6dP34U14mztQ88A78b0
+=8gDp
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.10.ebuild b/x11-misc/colord/colord-1.2.10.ebuild
new file mode 100644
index 000000000000..3b9e825261fc
--- /dev/null
+++ b/x11-misc/colord/colord-1.2.10.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.10.ebuild,v 1.1 2015/06/07 14:24:09 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 check-reqs eutils gnome2 user systemd udev vala multilib-minimal
+
+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/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="argyllcms examples extra-print-profiles +gusb +introspection +policykit scanner systemd +udev vala"
+REQUIRED_USE="
+	gusb? ( udev )
+	scanner? ( udev )
+	vala? ( introspection )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=media-libs/lcms-2.6:2=[${MULTILIB_USEDEP}]
+	argyllcms? ( media-gfx/argyllcms )
+	gusb? ( >=dev-libs/libgusb-0.2.2[introspection?,${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8:= )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	scanner? (
+		media-gfx/sane-backends
+		sys-apps/dbus )
+	systemd? ( >=sys-apps/systemd-44:0= )
+	udev? (
+		virtual/udev
+		virtual/libgudev:=
+		virtual/libudev:=[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!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
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	extra-print-profiles? ( media-gfx/argyllcms )
+	vala? ( $(vala_depend) )
+"
+
+# FIXME: needs pre-installed dbus service files
+RESTRICT="test"
+
+# 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
+}
+
+src_prepare() {
+	# Adapt to Gentoo paths
+	sed -i -e 's/spotread/argyll-spotread/' \
+		src/sensors/cd-sensor-argyll.c \
+		configure.ac || die
+
+	eautoreconf
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# Reverse tools require gusb
+	# bash-completion test does not work on gentoo
+	local myconf=(
+		--disable-bash-completion
+		--disable-examples
+		--disable-static
+		--enable-libcolordcompat
+		--with-daemon-user=colord
+		--localstatedir="${EPREFIX}"/var
+		$(multilib_native_use_enable argyllcms argyllcms-sensor)
+		$(multilib_native_use_enable extra-print-profiles print-profiles)
+		$(multilib_native_usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "")
+		$(use_enable gusb)
+		$(multilib_native_use_enable gusb reverse)
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable scanner sane)
+		$(multilib_native_use_enable systemd systemd-login)
+		$(use_enable udev)
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable vala)
+		"$(systemd_with_unitdir)"
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable some extraneous checks
+		myconf+=(
+			SQLITE_{CFLAGS,LIBS}=' '
+			GUDEV_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		gnome2_src_compile
+	else
+		emake -C lib/colord
+		use gusb && emake -C lib/colorhug
+		emake -C lib/compat
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C lib/colord check
+		use gusb && emake -C lib/colorhug check
+		emake -C lib/compat check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		gnome2_src_install
+	else
+		gnome2_src_install -C lib/colord
+		use gusb && gnome2_src_install -C lib/colorhug
+		gnome2_src_install -C lib/compat
+		gnome2_src_install -C contrib/session-helper install-libcolord_includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
+	einstalldocs
+
+	newbashcomp data/colormgr colormgr
+
+	# 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
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/x11-misc/colord/colord-1.2.5.ebuild b/x11-misc/colord/colord-1.2.5.ebuild
deleted file mode 100644
index 4c6470342576..000000000000
--- a/x11-misc/colord/colord-1.2.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.2.5.ebuild,v 1.4 2014/12/19 13:44:12 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-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/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 )
-"
-
-COMMON_DEPEND="
-	dev-db/sqlite:3=
-	>=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/udev
-		virtual/libgudev:=
-		virtual/libudev:=
-		)
-"
-RDEPEND="${COMMON_DEPEND}
-	!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
-	>=dev-util/intltool-0.35
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	extra-print-profiles? ( media-gfx/argyllcms )
-	vala? ( $(vala_depend) )
-"
-
-# FIXME: needs pre-installed dbus service files
-RESTRICT="test"
-
-# 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
-}
-
-src_prepare() {
-	# Adapt to Gentoo paths
-	sed -i -e 's/spotread/argyll-spotread/' src/sensors/cd-sensor-argyll.c || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Reverse tools require gusb
-	# bash-completion test does not work on gentoo
-	gnome2_src_configure \
-		--disable-bash-completion \
-		--disable-examples \
-		--disable-static \
-		--enable-libcolordcompat \
-		--with-daemon-user=colord \
-		--localstatedir="${EPREFIX}"/var \
-		$(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 policykit polkit) \
-		$(use_enable scanner sane) \
-		$(use_enable systemd systemd-login) \
-		$(use_enable udev) \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		$(use_enable vala) \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README.md TODO"
-	gnome2_src_install
-
-	newbashcomp data/colormgr 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
-}