3 files changed, 22 insertions, 13 deletions
diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index ac5f52f19519..1fc0eafa5b04 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.175 2014/06/19 03:13:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.176 2014/06/23 04:32:42 phajdan.jr Exp $
+
+  23 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> lcms-1.19-r2.ebuild:
+  x86 stable wrt bug #504214
 
   19 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org> lcms-1.19-r2.ebuild:
   Fix file collision with emul-linux-x86-baselibs
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 28684466b5ca..3115ef96a833 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -11,23 +11,29 @@ DIST lcms2-2.4.tar.gz 4293291 SHA256 2a514d10eff26901505c191a15c2588c751eb7fb865
 DIST lcms2-2.5.tar.gz 7000396 SHA256 6727772b44470a2111dba53b9ce4c952b87e7d1b72a31c5ebdf44ba6eb0aa72b SHA512 c41daee7bb366eed940283d3760e5862d8d2bb6e465d1f712123449a2013431321155c8500dba4c4393a1e49fdef0bc2f5399e1573f0295cc0dac3fe88c60853 WHIRLPOOL 72512f300b03344da9a932ad10b723d830a549a977dcf6750b0d88ddd217693e93ae05b23e239ff984acf34375ea8895b187be57dff14448253881a7b8dd2414
 DIST lcms2-2.6.tar.gz 4583389 SHA256 5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 SHA512 af2dd8829a5d8b280688bc247812829c885368951d385a23a1596cf8d0a7aed627c8faa35740073efc51a86ef5c900fc9bdb9dcdfad885fb8b1eae16953f9041 WHIRLPOOL 4fe1be53c48b0928bd474e05613c443eea49570a074d22b71863c485408523116927655b57d86bcb02aca85d9e06c0e26d9ee46bc7c4d746e91e951212de9e59
 EBUILD lcms-1.19-r1.ebuild 2610 SHA256 3d230082928ef515e07758aaf25077785dfd048460e0bd89dcb295b79e4510cb SHA512 c69884dd438306ae423750935514a3a52ad9d7c10fa3c930677c4e00e44e6fcb23a896ee25c541984a4168d35926ed9724e4f08f6c747da78ee0706ac83bea63 WHIRLPOOL ba380deb3733eb8f652ae3443de8e5b3627239679ce260eb739abe4e8b646367898f468c5a84ded25aa91fb975050d7c8c4959e37752a4af027d0a1c359a9034
-EBUILD lcms-1.19-r2.ebuild 2945 SHA256 991fc86f21f13c2bdfd525d78c9d346e85c0f86d3d09eaebd413943add266f8b SHA512 1b82291a24d79c722d6999c070a9d3209c01ad8b97ad3914dda746b0d4599e0dc59bbd93708f87bfb6ed7d8d78e98b5c52a22deb0e6a7bb38b08e2f2a9c550ab WHIRLPOOL 3221939e1e292f4718634ede620a629a3594dab47decc6c20f12648af78d449d310d5a2ed856af253196255ba74373e19eb76187e9ff8b78cb592eb9d33e2b99
+EBUILD lcms-1.19-r2.ebuild 2945 SHA256 c3014b847f8c24e6ba6efa190fce9a85213fc4780348fac0e3c4f29096358a82 SHA512 f116f1e5954e8d5a175fbe61cbadd3532c9ae97d14824acf3e1aae8be91aa8309ceaa43892ad07469d8953d3f6ba3b4cda8af890c54d2ceab7486c06b1410e72 WHIRLPOOL fcd1208562c1f28c22edc1aaa74632d4de81734e8bf56111fda8c516967bbbad0edd6ce90682694bb312ae87f3fa0b9a1e46275fecd33fb1012915132953ee6b
 EBUILD lcms-1.19.ebuild 2710 SHA256 0e21a730735f70db5d58b7eb16f453bc50f5953c5cbc2eb86eb73eb8d528f479 SHA512 1ef0381d435d04e93fc330eb892f743c48a986f368914a6c452c0575417f1119344e65f906d84f565ecfe8ac9d0283fae2e9bccc6d5f2545a51cd8138846562f WHIRLPOOL 8fcbc34c9e4814b0720cf487442b3ee32632900c8b8f4024f40d87f65b9d38ac4e9c515e1ba82446166899cb106d0c0b6bf64e9d974e5614f65757c0ee0642e2
 EBUILD lcms-2.3.ebuild 1199 SHA256 2a48cdc394f86efd05a30227deef20095077dd719266834d93c91df867a926ed SHA512 bfecb719eeb71da7c0ffd65d69064e73a174de4c58160f852be59f720957b42c86d9e85c8f4000d945314b61a5240828af1628f394f0cffae26d1aa25e581ac6 WHIRLPOOL 8de76ba66d15ea0f9d3509a17a72ebd817c04db87893449a12ac20fb3987d16609f5eed626f45a276d062afa80ef2a41a5507e80cf165e163deed1e3f2c9811a
 EBUILD lcms-2.4.ebuild 1223 SHA256 9913a16c3eb028e2b7801e91ceeac15d6097c1b9a772396a7f57144655473aca SHA512 4f4c781f0133bb8b7299e8840709ef955a228c0c5d6ab1d4faf043da910c8be80c6f43e77ce79b79819ca062e8f0df4e2963f14e6d1428230eb76e1b64edf6f2 WHIRLPOOL c30e5ae288833732fa8284d72da967eb6d448ff3d2a1554556b122ca262c7fdc422a1542c25628afd3c56dba7c3e51c824bb442b5139e6f61a4bfb5de88d5557
 EBUILD lcms-2.5-r1.ebuild 1383 SHA256 bebae0d4da68a9f2ed9cb5ad6bd465a418da24061be1f0bf9b28305150d06270 SHA512 a959c3feb304c53e73740d73db05d95d53792fa9e6fab2490639f89afd6abd9380c2c4114c920c8b31afb3439cc019174d398de843adf57fcd3057dc4343412d WHIRLPOOL b7d6565f4ae0c97fa4356575f41969206399c23903fcfec7a1fa900e92e8f7639c61815dac5e90bcf5f88ac39789e4b998bf45ba0ffe50118b5e1f70feb0f0b1
 EBUILD lcms-2.5.ebuild 1140 SHA256 84d16fbd4e4d820e01350167face78804aab8c8fb32ce2e178d2f4b0c2eefc48 SHA512 00b536ca98f6f2c0a91360b79ff97b310744fc396e798feed98e68361e1e9d8675c23a959d721047af16bc3c63c2aedfd8367954027946cacf355124a244f984 WHIRLPOOL 2f1a9af5ec48cbe4f25c3e678ad5e07813a838b9bb87d8ffa8ab03e38e52376fa59dd9efbc2fe53033dff9ed03ec8da7d50e95f8d4eac67c2259684e7956cab1
 EBUILD lcms-2.6.ebuild 1412 SHA256 855ea682afa9569531f2579aae3359bf6d30578d7e8a5caeebf27fc6556b3d73 SHA512 aa6f23dfc5cdb1ef742151f2eb5bf02e531b150bea86cc46abe7dc95ab546c7aa2a30aeae06625853bdbfa351d4ce3c38d120d1ead48b9b2a2e7d8919e3a9405 WHIRLPOOL d42dfa700752b758503a72243469414a78dc2b2e4b7c93a46374feb85f07df6c57121c305c1be18829c915aeea380e5176fb4547325dfd2e3467fd2d122167ea
-MISC ChangeLog 21872 SHA256 2bf4f26b62e7428b02bce4a3cf734fb307d990b23ef94991a11e56d232daf107 SHA512 10cc75878aa6533643790fd0757640cd980dda3a1167cbccb453d67dffd22873f239ccfa2f848288e63002b556921cac3eb7a24ae549b9769e398504177bb173 WHIRLPOOL 74daf416c9e9bb333d2f96cda67c92d5b3d17548287b338f8722b05f46a4a54f1bafa5fec2f6789b6a17c766ad270e07119325472e3916e145a7530566ad34d6
+MISC ChangeLog 21979 SHA256 82ddba07f1a0e04e9b6f220ce180a92bc149180efa2f11b819a5c0d6b9e7d3de SHA512 4c73f07589df3a4e9ecb99b8b320a69270403afc84bc94117d72201d919c1d725d1a106313bfebabd774e7452f1afb45040d240192de1e5f10bc2f7c0a17312e WHIRLPOOL 1e5790ae86dc51f2a3ea1d89ded3dec92e74cbc1cd6139ecc080bc9cc9b9cb2969ac2ca9f6c5407dd32aa18e37f81132545b273de846968e311835c2290a5d80
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTolUFAAoJEJ0WA1zPCt1hEqkH/A/1zYuZCjSubsYmk/mKW9rJ
-cnTXrgquHFjXPmnWvo0M3eH8QHXUktS5du3pzWsm9BhzpzWJ6hLomvR5QmvPS9sU
-kiKZFtetNK9iYi6IRxlcWOu63gn9EukQQPVO6rZHIDzCspxEkrk4IOK5VQQq8pGh
-acIu3Oq+qSP5xINEduJ+z+QCbrd+e5HllALRFkgtxUKINlECEdcb6JEr4QU67dJm
-Hw4kHsTbF75yF+yNCFBYde0dSujcoWkNgZGuRsqdalN0e4dXSPZ5EZkRz940hRpR
-4Ggb7WokuSE7gn1gpQJg4KUG3dj669IHUGdA8BZOC8cFiLQqMc6P7jHrG1129gM=
-=SQP/
+iQIcBAEBCAAGBQJTp63zAAoJEE8aJVXqcZkdkfcQAMWy/GtSElSLM9Z3FM+EPM7m
+EiP4dKeohCIrsB1CdumuGAVuVbFLhNBziML1wQnU9XK76ZRWFmXPhvVAD6MUi2v9
++kxo8mibjYgWTURFxLdg+m77m9atow6a19SvZJE2oLd3Zoqn/lZo/9y6q3hs+eDH
+3Uekf9RqJ1nXq7Bhb8btqlk9zC+IVnMikHbPJk3Y7fhL6N1+889AookcOR/uSkia
+UY6truQOAqPdewpNUagHwrc7Sla0fV65ZtxmPzDReDNpNDGWghAaIZYVONEFchjU
+p+meUlNUiBgcVBkBUvwnJcpeeVXFPN5pQS2SAaCLXlT5nhFuIc+9GdqWKuzPGLFO
+LYNg4ncRZfeq5lulGLPqsGycF66Y2SW9UQoDIS2MQxUMwm/n78mkpiVZVdsyaP7d
+07Q2tyk6L0I8bpwr+xL5qn7UN9YQpCxuLVYh12LdKHFVW5zQc5st9s4L9hUH5Xiq
+CYDr+2yTXgzfYMLNzwZ6bYufE9ClsBG46X6afGSPw9DNZ2cMSeCYi5EeJBMCKbYh
+NW9102s2t6aHsckpu9vNgIzfqwGYpNV9b1P6sX3tFg4XIVjhl24x8x1Ekri+2kvw
+uIl0Dhia1Uy2i1YVLk3axSpoWOspnFuPa+KA78bBI0tMF9cs28Gvfu6b9UNur+9p
+KT/i6ACPQ7I5mx+mEnkG
+=10G6
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild
index 9ea0f8784e31..96b02ff5fa15 100644
--- a/media-libs/lcms/lcms-1.19-r2.ebuild
+++ b/media-libs/lcms/lcms-1.19-r2.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/media-libs/lcms/lcms-1.19-r2.ebuild,v 1.3 2014/06/19 03:13:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild,v 1.4 2014/06/23 04:32:42 phajdan.jr Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="jpeg python static-libs tiff zlib"
 
 RDEPEND="