old

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

diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 1f5030181ae5c52e7ebbf93c883a2067cc5fe3b1..e77a12434ef009fce3eb74bf6fc0660f5708b5ff 100644 (file)
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,7 +1,4 @@
-AUX lcms-CVE-2009-0793.patch 971 RMD160 6f7b14dd2b97071cae7c1b70d3e28df32431a137 SHA1 41714817248f5475ac975f815bf8847bbba3b034 SHA256 da71dbd8af0b287923ed48112fd85b43b9cc8ef82f051f4f499edf4c95898de5
-DIST lcms-1.18.tar.gz 915536 RMD160 76c37ac029f733bbb9a850234e62bfd2a4a04bf4 SHA1 7001badb14b2e9cb89e2637bdc56f23ebff2d40e SHA256 558f8e96c8b43a4e682295629ad84f154454b6c6447d8748401f7bcd72c0eb71
 DIST lcms-1.19.tar.gz 927752 RMD160 530615c061dccdcb64d75c6fab148dd565bb6c91 SHA1 d5b075ccffc0068015f74f78e4bc39138bcfe2d4 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
-EBUILD lcms-1.18-r1.ebuild 1344 RMD160 0aaba8373cadd0ef20d5a78e328d50179e73da71 SHA1 072a246cf017adee1b3f0c308bda969c48acc761 SHA256 8930d511c3bfdbc42fb09c049c44c91d6867caf03901878183bdddb86d6364b0
 EBUILD lcms-1.19.ebuild 1262 RMD160 eda3c32103e5f29142bf44a56a06f69a785f860c SHA1 91060f3513e5dcfe2eaefc51c31f7e8ff2115a57 SHA256 9e3f519baf1a682726d4aa40f0cde5d5017e0947a3937b37fd192cfd93ff2f49
 MISC ChangeLog 13545 RMD160 3464b6b44eae7439a84ce8c4d8be12ce397eb5c8 SHA1 923e52de49df930c4536d0ca7aef018c8be1ba6f SHA256 245d6d56dad8b9974ba69c7bb36c09ea61611773e76842b0982faf2ce43adc55
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76

diff --git a/media-libs/lcms/files/lcms-CVE-2009-0793.patch b/media-libs/lcms/files/lcms-CVE-2009-0793.patch
deleted file mode 100644 (file)
index 6cdcc6a..0000000
--- a/media-libs/lcms/files/lcms-CVE-2009-0793.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN lcms-1.18.orig/src/cmsxform.c lcms-1.18/src/cmsxform.c
---- lcms-1.18.orig/src/cmsxform.c      2009-03-21 11:31:52.000000000 -0400
-+++ lcms-1.18/src/cmsxform.c   2009-04-06 09:24:26.000000000 -0400
-@@ -660,6 +660,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
-                 GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
-                 FromLstarToXYZ(GrayTRC, Shapes1);
- 
-+              if (GrayTRC == NULL)
-+                      return NULL;
-+
-                 // Reversing must be done after curve translation
- 
-                 Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]);
-@@ -675,6 +678,9 @@ LPMATSHAPER cmsBuildGrayOutputMatrixShap
- 
-                 GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
- 
-+              if (GrayTRC == NULL)
-+                      return NULL;
-+
-                 Shapes[0] = cmsDupGamma(GrayTRC);
-                 Shapes[1] = cmsDupGamma(GrayTRC);
-                 Shapes[2] = cmsDupGamma(GrayTRC); 

diff --git a/media-libs/lcms/lcms-1.18-r1.ebuild b/media-libs/lcms/lcms-1.18-r1.ebuild
deleted file mode 100644 (file)
index 5005af6..0000000
--- a/media-libs/lcms/lcms-1.18-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.18-r1.ebuild,v 1.8 2010/01/28 15:15:35 ssuominen Exp $
-
-EAPI="2"
-
-inherit libtool eutils multilib
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="tiff jpeg zlib python"
-
-RDEPEND="tiff? ( media-libs/tiff )
-       jpeg? ( media-libs/jpeg )
-       zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-       python? ( >=dev-lang/swig-1.3.31 )"
-
-src_prepare() {
-       # Fix for CVE-2009-0793, bug #264604
-       epatch "${FILESDIR}"/${PN}-CVE-2009-0793.patch
-
-       # run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
-       if use python; then
-               cd "${S}"/python
-               ./swig_lcms || die "swig_lcms failed"
-       fi
-}
-
-src_configure() {
-       econf \
-               --disable-dependency-tracking \
-               $(use_with jpeg) \
-               $(use_with python) \
-               $(use_with tiff) \
-               $(use_with zlib)
-}
-
-src_install() {
-       emake \
-               DESTDIR="${D}" \
-               BINDIR="${D}"/usr/bin \
-               libdir=/usr/$(get_libdir) \
-               install || die "make install failed"
-
-       insinto /usr/share/lcms/profiles
-       doins testbed/*.icm
-
-       dodoc AUTHORS README* INSTALL NEWS doc/*
-}