Restrict media-libs/lcms depend to old version.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index fca795459e7b78520d7623729aab54d7ee0bcce4..4f3db9d5c365e0b3f2982de5d857eae25c7f4ddf 100644 (file)
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.240 2010/06/20 18:20:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.241 2010/06/21 09:57:41 ssuominen Exp $
+
+  21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  poppler-0.14.0-r1.ebuild:
+  Restrict media-libs/lcms depend to old version.
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> poppler-0.12.4-r3.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #323271

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 30c8cb756251e8379c8b1d1cf60bd2c4fad02007..c6a2ff04668b12eb10ed7f9e99c128466d2aa793 100644 (file)
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -14,6 +14,6 @@ DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb
 DIST poppler-0.14.0.tar.bz2 887492 RMD160 a90ff77a186afa096bebc2d04af1c3d49a146898 SHA1 cd3505688435f9288bdb4b8384c60dc5adac822f SHA256 a5d64d5d0d416c7130694993acc68e3c96e4aeb070b9d12dc6ab6cb3b75cc720
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
 EBUILD poppler-0.12.4-r3.ebuild 3603 RMD160 d30cf148fcca446f44b25c1fa71eac469260862b SHA1 000dca41b950f6f3c7fd4872a689e173ae1c347f SHA256 a766e9380993c637b0ea80026610a4e26b65a1ae94254cd8fe34e97f03952c28
-EBUILD poppler-0.14.0-r1.ebuild 2745 RMD160 fa037a395853ddb4320302ccefb95edd838f62ba SHA1 3ff03a31795a6db6f05d7150aacc2c671a1dbae4 SHA256 39848f08e657647902de37d8a64e4c3343452246d19ad95c077cdf0ed4e77e8a
-MISC ChangeLog 34466 RMD160 a5851b3022eb968d405ca5c18b2d76e1bd3e617c SHA1 22c931d474af614a2848ede38ddb9412b0fa819f SHA256 e843ff01e44c2bb20109b45cd14fbd88fd9528a3e4531b4814f8f59ce9f1fb15
+EBUILD poppler-0.14.0-r1.ebuild 2749 RMD160 0f6c680dbd98192bc6e86ec8468dae28b99784ed SHA1 249a594ba2bb78438ac6593a816b77dfee5a8f92 SHA256 241a1ffe494191788e003680d393fce1db366b52a8b6f1476e28afc02dd58621
+MISC ChangeLog 34601 RMD160 abdc8a31fd5f60df660d088c789430174106b81d SHA1 ab2dcdc54edbbc436fd0ef92011cf5cc97f7f4bc SHA256 6755078e599646c3cfe5137a6e6f0a7a716214f5b5398b53c47daddefda28127
 MISC metadata.xml 564 RMD160 078af3bfc173aeaf994a9886723d7ca9a73f9b3f SHA1 2288b78748160193bc62d30bb458a26afd031f04 SHA256 3be05c7573d0473701d0589caac0ed0c7bf4f738bf33d6e9bda47166d6ad7ace

diff --git a/app-text/poppler/poppler-0.14.0-r1.ebuild b/app-text/poppler/poppler-0.14.0-r1.ebuild
index b29b588d2bea4cd3e24da9c790fef073ed98d140..deb67a4755b806c061e87b96128fbb0a73ac0116 100644 (file)
--- a/app-text/poppler/poppler-0.14.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.2 2010/06/09 14:38:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.3 2010/06/21 09:57:41 ssuominen Exp $
 
 EAPI="2"
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="
        curl? ( net-misc/curl )
        jpeg? ( >=media-libs/jpeg-7:0 )
        jpeg2k? ( media-libs/openjpeg )
-       lcms? ( media-libs/lcms )
+       lcms? ( =media-libs/lcms-1* )
        png? ( media-libs/libpng )
        qt4? (
                x11-libs/qt-core:4