Adapt to spotread path in Gentoo, bug #520846 by Alexander E. Patrakov, drop old.

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

3 files changed, 18 insertions, 8 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index 927b99311d75..26a127203f08 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.85 2014/10/02 10:01:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.86 2014/10/14 08:37:24 pacho Exp $
+
+*colord-1.2.4 (14 Oct 2014)
+
+  14 Oct 2014; Pacho Ramos <pacho@gentoo.org> +colord-1.2.4.ebuild,
+  -colord-1.2.2.ebuild:
+  Adapt to spotread path in Gentoo, bug #520846 by Alexander E. Patrakov, drop
+  old.
 
 *colord-1.2.3 (02 Oct 2014)
 
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 22daa3eb37ad..26923398bb3f 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST colord-1.2.1.tar.xz 1164544 SHA256 2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea SHA512 a0f6756f1f30a671ab723286cab445394c90013c5da6689786d91e28b6b272fa3cbb6afccf55af3b643890092187fc9ef0500a469ece8c16f7afc1b2b018ca03 WHIRLPOOL c3e00b89f4b8b720f2997e3b530b7b2db932c1cbeba98ce453c48e84f9768cade09f73a7fe9a8b1dbef0ed3f35362b652a535b09846b8b1eef53985e05467e5e
-DIST colord-1.2.2.tar.xz 1176008 SHA256 d9059710321a231657932dd9f824a0cd5b71f90e2812c219f336ee1693066529 SHA512 0edf48de8f64f8df5300c8cb0fab64f1832cc7908b7bb347d59d9de4bb86866dc26030510ee149dc581338df01194af3947ca34909c8a560a08d33acffda6a2c WHIRLPOOL 6f12f85e30aff239bd57c1b0a28779bf729a2c17bb67c0d705cdb865d0deff4e507ffa527ed6bfe62fa4f67771a7ec7917a88175dc239df1626fc7f0058deafe
 DIST colord-1.2.3.tar.xz 1177524 SHA256 2091fcca19d049136644e9dc6d56849b0e29d441a81a955d8f0e8135163474fc SHA512 2cf96c62e281c8efcc90aa449bceeb40ff779eec637b4c0f538e928e5b28bd1f3b85b8613bf9d7d1edbc76e70ec7240bd90be3d7546970f157783d533774aa15 WHIRLPOOL 30eac65269b96c7120fa9a86e42c53bb04882512e90cc7322af654a644e868017f1f56f03d95aa6b602adac7fd5f4b0535beb79c08612f331d3f33e1d8c655c9
+DIST colord-1.2.4.tar.xz 1177272 SHA256 98440deb524f71894a3542cd84c1f10e9306092a908854227b1b065ea3274035 SHA512 44ff87d41be3cd1efb235d617198842685ce0392ffb6e727b7fcc0efecea863a5cbcc52e8acaf86a7dc85f0b0698dbced8ac484fa4566906fbc5fb070f7ee7af WHIRLPOOL 63a99326ff9555109b0245d4a0859fb5cd2ad7e290fe2f8dee4532147556843d4c013a17fb7cbe9fcca18294f57c381c58586cb6368a5aa03a245c7137891259
 EBUILD colord-1.2.1-r1.ebuild 3283 SHA256 a60aa2b91abc9166aa86b2ca35495e29014d5d3051ce1fb0ece6420c06bd727c SHA512 7abbcfad537aee8e65a02890f40b601854bd471ad281129555b2fa83cd7423c79c8dfc290ff762e510a16ab78bf6e20e6ace033161fbe0bc856aabaf94562a0b WHIRLPOOL 1771d403e72e6a9b6c2145dc943b0025e9b9336f2dde8794686e4a891d5af6cc2a18b830e0afa66f1d3f6e07e43492b38e839537f163069567c35f841eeed95e
-EBUILD colord-1.2.2.ebuild 3322 SHA256 e297f82ecd1b3b5d8afd6d7af1c2527db215bc36e6ffc27f56a37392c16cb857 SHA512 9b0d80e1bf9ccb1a115c18bb6184f8495a4594345d0653f6c43704c2c229961a1fe9ec97d1ffdaaba63b0a25b4afd083085d649aa4864a1918d9a0a49b2c1d89 WHIRLPOOL e2a26a68524b30467638518f7447e13e4e01f3d0160e4848672f647be0bef8deed5411ca271d1d2289d3cf1ad9cfb484ef99294e8ac463ad23ca7c061fc97e20
 EBUILD colord-1.2.3.ebuild 3322 SHA256 befe159de78acc6a5f1b2aad6680c36059748d09c0de4d73aa05a934c89f409d SHA512 28dd0fd6c4fed7cfbcec6c0d6d92dc7e36692d01172c5ac77162d259e6f99256e77126ab96c50f0d4336026c047aa5c11882fb4fc7113c30e5dc38b942c6e6df WHIRLPOOL ab81300173887f602547f269542d7bf9172fb2b003a1ac8b964e62d5ebaf75a6ce32ec37ecc75b6d85a40baae412da190be5349cec9ac55877149bd92f6ecff1
-MISC ChangeLog 13986 SHA256 e216f27eb5601f97aa2d9d7c5f93c39b1a5a4404a88dd60126b88eabe49f7f98 SHA512 5cbbe17c52f91e45f5b390a0347e83c000cfcc48011d1f7dc22256ff0f2c843c818b98e79912899a30dfb601fc03f2032d8b4cc4c16d0edc2a6f4e3c89665bf2 WHIRLPOOL 98848c77f581d88425c5ad0cda10d2b44989b60f4a56b76bc6f3d1c9eb9261a8f58b6fbb899971c4366e39ac4e62b022331e9910846422c1f25114e97a46b2e4
+EBUILD colord-1.2.4.ebuild 3427 SHA256 58c93feb42d895ebcb3717e034091465caebde00c600bbd01cc609a556156523 SHA512 87ea11b0f2b421df09729dbddb0e5181163f23dac59da3f11d94d1837c1ce6d2bee4697ff653c608531f73c2a90f9996106c4f72aecdaf6f05bcc985eb812f2f WHIRLPOOL bb94a203ba1bdf87f13bb24c71f96d580c91eeb1ae7811b91e21965a3325a08384152e3dca5b01c96665fe137a5a4b0556eaec2d9f71724c67da4fb4bdb02a91
+MISC ChangeLog 14194 SHA256 1ba026cac779ec766f848d2824fde3f3a6e0d8b3b9420c03bc5549a9b01dae91 SHA512 71aaa4db5b5716fcb0b33f31e4c7e3ee2c9481fe0ea48382e3e19ace1b9cc4291b2293c35612ec1cf10343333af6e414bc28186f8fe9afdad0a115fbf8ff9b85 WHIRLPOOL 4783f35e74a4ae61e493144ebbf5d77a4109b6fa9177de119b30cf91e22f3e744ee8c27645fc9f28be2b06f21b35ae7846b879880f7c9524273c3ac02c94e34a
 MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQtInYACgkQCaWpQKGI+9TlvwCfdbi+B5NnnNpZsjgiCw1iTDcd
-kwsAnjk/s8LXopGS/c2y78XZJtXdYli3
-=OwN/
+iEYEAREIAAYFAlQ84MUACgkQCaWpQKGI+9SOCwCfVWM52TS/o2B5nKQzwseFJvh5
+IjYAn12ZYHXmfz25RkHgcN1u64RCOYUO
+=DrsR
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.2.2.ebuild b/x11-misc/colord/colord-1.2.4.ebuild
index 967336e7ba9f..c39998c776a4 100644
--- a/x11-misc/colord/colord-1.2.2.ebuild
+++ b/x11-misc/colord/colord-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2014/09/07 14:05:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.4.ebuild,v 1.1 2014/10/14 08:37:24 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -73,6 +73,9 @@ pkg_setup() {
 }
 
 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
 }