old

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

6 files changed, 21 insertions, 125 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 9967aeff826c..38887ddc9a98 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.143 2012/04/26 20:40:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.144 2012/08/06 09:19:56 ssuominen Exp $
+
+  06 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> -lcms-2.2-r1.ebuild,
+  -files/lcms-2.2-fix-test-on-sparc.patch, -files/lcms-2.2-header.patch,
+  -files/lcms-2.2-lm.patch:
+  old
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> lcms-1.19.ebuild,
   lcms-2.3.ebuild:
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 0f95338734be..6d101534ddee 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX lcms-1.19-disable_static_modules.patch 578 RMD160 258765bda276cfe1e4a73111ac094962096570ca SHA1 3d54655f2f78a506559c3ebd5a93bb80bd6cce5e SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e
-AUX lcms-2.2-fix-test-on-sparc.patch 1075 RMD160 1bfa375e074f88824d138d23124e3ae2962fd0c4 SHA1 2b6a2c0aafcbb60e020219574fc22ba6c0f45f33 SHA256 798a698e1c8e16db26d3438d9125857a92bbe30c96ff292c68177a989dc4b7df
-AUX lcms-2.2-header.patch 226 RMD160 9543dbf51ea82f40ff8c236ffe07db19bb48c72f SHA1 08234a777a49f059bb84c87b685d631824f725ff SHA256 e9a38177648562a8d3f4fe85fb3ffbdda35f7c6597e91fc28fa8e6770267cf20
-AUX lcms-2.2-lm.patch 190 RMD160 4ed185aa95f645b353e56db37d35286b3d46c18f SHA1 194a8c6762193302e53bd0444686e2f596734080 SHA256 bc8150de3232285ac32227ff18b4b9c81a3cdb162225bd363e136f8d5bd26a1c
-DIST lcms-1.19.tar.gz 927752 RMD160 530615c061dccdcb64d75c6fab148dd565bb6c91 SHA1 d5b075ccffc0068015f74f78e4bc39138bcfe2d4 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
-DIST lcms2-2.2.tar.gz 4193353 RMD160 8e35a351c9549e53ebe4f120cdc5cf35e8b693fc SHA1 55ae4884a92c7fbd491c118aa3b356814b1014df SHA256 b6f2a1be1a2b7ca54bfab69b32242d383a176637f161eeeaef451bd9fc1195cc
-DIST lcms2-2.3.tar.gz 4461644 RMD160 b6a32e53abe3e3ca19c10a6fac7da63c6f0bfa3e SHA1 67d5fabda2f5777ca8387766539b9c871d993133 SHA256 3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4
-EBUILD lcms-1.19.ebuild 2472 RMD160 2609423a07be36b7a3f87df96e43a3ef5556c113 SHA1 94758066a37e7a0e7cc1264ff5b1ca953dc6a10c SHA256 beb5cfc7d7d7550d09578d8b0e63516378566a2f7ed40b1cb56b49dbdef39969
-EBUILD lcms-2.2-r1.ebuild 1224 RMD160 7f75d8eeadb7c35d63b6257d0c9d7fc060f963d6 SHA1 aebd7753ec80d91cd84ddda1f2f03233c2220a94 SHA256 6f32d9d4437674448233cd20aac051c038fbe3a8369294025ebbd17956bc9637
-EBUILD lcms-2.3.ebuild 1066 RMD160 9a2c8b10f0e0c5ac6fb045050b561c64db80e3c4 SHA1 719a94e52e75bf030853e8feea477dcde99008b2 SHA256 35fc686d6de550b5c0e11f3bff2b8bef7bd093b1caa43c25b9f73f66e1355500
-MISC ChangeLog 17399 RMD160 dfde7af6e131b7aa7794667f78d4dbdbba2b7d3c SHA1 4b58eb7073604de5cf92969a7f3f9fddf9d8e666 SHA256 69eb8af2804e96105e5f5369a2e49403c0e1ffdeebd98f6af14d1454fe5036f5
-MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+AUX lcms-1.19-disable_static_modules.patch 578 SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e SHA512 fba391dd6d69122217cdcde985d2154dfc2fd9b9aed5a50a013248e024ee54fe07a98acf917fd0e889578616512a2bdf155f0cbe782795e406d96a90b10bbb33 WHIRLPOOL d40c77d18ab5249252e4cadd5b6e2e40c1e43c0f761758908f2afa06d29dce41d56de52d33fe043d7441180c40ca572571fb7c27b87c43406991e5f1e25ff22c
+DIST lcms-1.19.tar.gz 927752 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 SHA512 85a55ad0673f0df2aaa80d18caa50314319f8da5ee4d84eed919059d0dad9861d684ef6353ce0ec6f9892a4603ce8e8e12f84d46858e23f52846b8aefd3cf449 WHIRLPOOL cb6bcb5497798ff2fa86ff433eae6afea38408306345156da6103aa8af6fc0d48fa1d730c5958c027ba06ea023236328bcb00be60f600d987d060625385c820b
+DIST lcms2-2.3.tar.gz 4461644 SHA256 3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4 SHA512 a1aca550ce357b04379b3faa7c67b90a6c5fbbbc08b5a47f8802b3588846322f5c3bca53e66212c303927721ac43cac28ef0522298ae1b4f734d84a48eebc9d0 WHIRLPOOL 8bfdc5bf638589d69908e75a95cd148e0b656dc92a4020aba56a9e9f17b417a78cb0e863a8c3beafd0830a206dd440b817f03c20d64b8fb3457d9e95f23061c9
+EBUILD lcms-1.19.ebuild 2472 SHA256 beb5cfc7d7d7550d09578d8b0e63516378566a2f7ed40b1cb56b49dbdef39969 SHA512 bc577002b1e6165d24bddb2faef7fa4f3073b1cea1780cbb7b1526735c539f0a11fcf72a6bc6fc361da02337ea145d8e406eac3afb369680dafe52b690ab08cb WHIRLPOOL e6ddffd830fcc22ed39ad5281654f9fbb687a31bdefc35114da25bc8cc31043cd98ac340d601b5ae139bbd9ec0bfaffe2e7bdf614fc9424d43b08bd9e7c0db64
+EBUILD lcms-2.3.ebuild 1066 SHA256 35fc686d6de550b5c0e11f3bff2b8bef7bd093b1caa43c25b9f73f66e1355500 SHA512 409a2e425ad1ff81f3a037f3c4cdb51873e3646e776fa6a66e644dff7b1f2a5a49bc4e96d93c2bb22ac2bdd2201614daa0958dfc9bd8fb8a5168a2eea40708ba WHIRLPOOL 7b920c6d5c2422461e59cdc9a0b5f0e5e108b89e37581111db41a42f21c7adf81ed2e9614a74129b98231f7713b59d70adcffab4c7a7b1b19b404eda8a9d3bd1
+MISC ChangeLog 17583 SHA256 daf8dd56a341438261ae12792ac86d80245a5aeb847b12dc021f4ecd2664676b SHA512 6432a0d51b068f0e2f2d8574169ed57e0d961c5862b386b05df58e6ab8cc75d9c020793a65116ca53a737daa1aee58a9c8fdc6b5529c6fb93a139c8f84fba035 WHIRLPOOL aa85973eacb41b9c7ed57e4675965e8c315f1f4eaa129ed9456cfd675c512f1cbde1e3f9a50123c9f1dcf269ce1e01f434d6ed718412eb738516e558db75898a
+MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+ZsrUACgkQvFcC4BYPU0oFhQCfdXQjlVKLtl5X9ZcAezrZibCD
-PUsAniMeRZ/XSeuYbLx/Sa07clZ3421s
-=XdDQ
+iQEcBAEBCAAGBQJQH4w4AAoJEEdUh39IaPFNtlkH/i9z8LOA8BkQIfAuTGSHe9FE
+bDfuJCbO6Nv+7M37jzF6nVsgRrhWhu2aKlNAmod17wWdXPyf59J/KeJYgZu5xbrz
+4Nzth2ekjQB6J+gk++uDoTMICwCtcvpJrDlVsOUQQ2bIvbOEKh9J924NcCm61zET
+sSGGjnvDilLBrNnK/kTjLeCbSNS5EH1tyAlPqcfjRB/Ciqr2VooRDckv+jiCzFkg
+XEKq6dWxXFhP5KSPLFgaBPrHyD1g0BskidPiwmKyDOLG+YpXnt7W+0GUfHUr53gC
+SO+TfmF1fGll7p2U+c9R72/Pf9lNcAgCLjaq5iq6LmQrPkKoXBGLWrRh1kX8bcs=
+=VyK4
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch b/media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch
deleted file mode 100644
index 08e91c552184..000000000000
--- a/media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 0e33a46a1a15c60b6e736122d36c44bbe0a15789
-Author: Marti Maria <info@littlecms.com>
-Date:   Tue Jun 28 18:26:59 2011 +0200
-
-    Some architecturees does need aligned bus adresses (sparc) Fixed
-
-diff --git a/testbed/testcms2.c b/testbed/testcms2.c
-index 9a96d17..13fd7fc 100644
---- a/testbed/testcms2.c
-+++ b/testbed/testcms2.c
-@@ -73,10 +73,10 @@ static cmsUInt32Number SingleHit, MaxAllocated=0, TotalMemory=0;
- // I'm hidding the size before the block. This is a well-known technique and probably the blocks coming from
- // malloc are built in a way similar to that, but I do on my own to be portable.
- typedef struct { 
--    cmsUInt32Number KeepSize;
--    cmsUInt32Number Align8;
--    cmsContext WhoAllocated; // Some systems do need pointers aligned to 8-byte boundaries.
--
-+    cmsUInt32Number KeepSize;    
-+    cmsContext      WhoAllocated; 
-+    cmsUInt32Number Align8_1;             // Some systems do need pointers aligned to 8-byte boundaries.
-+    cmsUInt32Number Align8_2;        
- } _cmsMemoryBlock;
- 
- #define SIZE_OF_MEM_HEADER (sizeof(_cmsMemoryBlock))
diff --git a/media-libs/lcms/files/lcms-2.2-header.patch b/media-libs/lcms/files/lcms-2.2-header.patch
deleted file mode 100644
index 72e561c8152b..000000000000
--- a/media-libs/lcms/files/lcms-2.2-header.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lcms2-2.2/utils/transicc/transicc.c.orig
-+++ lcms2-2.2/utils/transicc/transicc.c
-@@ -26,6 +26,10 @@
- 
- #include "utils.h"
- 
-+#ifndef _MSC_VER
-+#include <unistd.h>
-+#endif
-+
- #ifdef CMS_IS_WINDOWS_
- #include <io.h>
- #endif
diff --git a/media-libs/lcms/files/lcms-2.2-lm.patch b/media-libs/lcms/files/lcms-2.2-lm.patch
deleted file mode 100644
index c79b6409c60f..000000000000
--- a/media-libs/lcms/files/lcms-2.2-lm.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- lcms2.pc.in
-+++ lcms2.pc.in
-@@ -7,4 +7,5 @@
- Description: LCMS Color Management Library
- Version: @VERSION@
- Libs: -L${libdir} -llcms2
-+Libs.private: @LIB_MATH@
- Cflags: -I${includedir}
diff --git a/media-libs/lcms/lcms-2.2-r1.ebuild b/media-libs/lcms/lcms-2.2-r1.ebuild
deleted file mode 100644
index 1ff9e80a8721..000000000000
--- a/media-libs/lcms/lcms-2.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.2-r1.ebuild,v 1.8 2011/12/18 15:25:09 armin76 Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-HOMEPAGE="http://www.littlecms.com/"
-SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc jpeg static-libs test tiff zlib"
-
-RDEPEND="jpeg? ( virtual/jpeg )
-	tiff? ( media-libs/tiff:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/lcms2-${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-header.patch \
-		"${FILESDIR}"/${P}-lm.patch \
-		"${FILESDIR}"/${P}-fix-test-on-sparc.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	default
-
-	if use test; then
-		cd testbed
-		emake testcms
-	fi
-}
-
-src_test() {
-	cd testbed
-	./testcms || die
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		docinto pdf
-		dodoc doc/*.pdf
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}