old

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

5 files changed, 6 insertions, 109 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/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 {} +
-}