Removed internal lmcs, added unzip as dependency. Closing bug #202594, bug #, and bug #, thanks Jean-Claude Repetto and Brian Caldwell

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 133 insertions, 29 deletions

diff --git a/sci-libs/libecwj2/ChangeLog b/sci-libs/libecwj2/ChangeLog
index 3afb514ae909..89c8d2fa790f 100644
--- a/sci-libs/libecwj2/ChangeLog
+++ b/sci-libs/libecwj2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/libecwj2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/ChangeLog,v 1.4 2009/09/23 20:07:53 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/ChangeLog,v 1.5 2010/01/02 02:58:42 bicatali Exp $
+
+*libecwj2-3.3-r1 (02 Jan 2010)
+
+  02 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> -libecwj2-3.3.ebuild,
+  +libecwj2-3.3-r1.ebuild, +files/libecwj2-3.3-nolcms.patch:
+  Removed internal lmcs, added unzip as dependency. Closing bug #202594, bug
+  #, and bug #, thanks Jean-Claude Repetto and Brian Caldwell
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> libecwj2-3.3.ebuild:
   Remove virtual/libc
diff --git a/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch b/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
new file mode 100644
index 000000000000..3be4142de4f5
--- /dev/null
+++ b/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
@@ -0,0 +1,86 @@
+diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
+--- ../libecwj2-3.3/Makefile.am	2006-07-02 20:14:18.000000000 -0500
++++ ./Makefile.am	2009-03-16 14:04:13.000000000 -0500
+@@ -1,3 +1,5 @@
++AUTOMAKE_OPTIONS = foreign
++
+ SUBDIRS = \
+ 	Source
+ 
+@@ -127,7 +129,5 @@
+ 	Source/include/gdt_pub.h \
+ 	Source/include/gdt_stat.h \
+ 	Source/include/pcs_erm.h \
+-	Source/C/NCSEcw/lcms/include/lcms.h \
+-	Source/C/NCSEcw/lcms/include/icc34.h \
+ 	Source/NCSBuildGnu/NCSGnuConfig.h 
+ 
+diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/Makefile.am
+--- ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am	2006-07-02 20:14:18.000000000 -0500
++++ ./Source/NCSBuildGnu/Makefile.am	2009-03-16 14:00:50.000000000 -0500
+@@ -113,22 +113,6 @@
+ 	../C/NCSEcw/shared_src/qmf_util.c \
+ 	../C/NCSEcw/shared_src/quantize.c \
+ 	../C/NCSEcw/shared_src/unpack.c \
+-	../C/NCSEcw/lcms/src/cmscnvrt.c \
+-	../C/NCSEcw/lcms/src/cmserr.c \
+-	../C/NCSEcw/lcms/src/cmsgamma.c \
+-	../C/NCSEcw/lcms/src/cmsgmt.c \
+-	../C/NCSEcw/lcms/src/cmsintrp.c \
+-	../C/NCSEcw/lcms/src/cmsio1.c \
+-	../C/NCSEcw/lcms/src/cmslut.c \
+-	../C/NCSEcw/lcms/src/cmsmatsh.c \
+-	../C/NCSEcw/lcms/src/cmsmtrx.c \
+-	../C/NCSEcw/lcms/src/cmsnamed.c \
+-	../C/NCSEcw/lcms/src/cmspack.c \
+-	../C/NCSEcw/lcms/src/cmspcs.c \
+-	../C/NCSEcw/lcms/src/cmssamp.c \
+-	../C/NCSEcw/lcms/src/cmsvirt.c \
+-	../C/NCSEcw/lcms/src/cmswtpnt.c \
+-	../C/NCSEcw/lcms/src/cmsxform.c \
+ 	../C/NCSGDT2/NCSGDTEpsg.cpp \
+ 	../C/NCSGDT2/NCSGDTEPSGKey.cpp \
+ 	../C/NCSGDT2/NCSGDTLocation.cpp
+diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDefs.h
+--- ../libecwj2-3.3/Source/include/NCSJPCDefs.h	2006-07-02 20:15:24.000000000 -0500
++++ ./Source/include/NCSJPCDefs.h	2009-03-16 14:00:27.000000000 -0500
+@@ -59,7 +59,7 @@
+ // Use LCMS for ICC->RGB conversions, supports both
+ // restricted and full ICC profiles.
+ //
+-#define NCSJPC_USE_LCMS
++//#define NCSJPC_USE_LCMS
+ 
+ //
+ // Use TinyXML for XML DOM Parsing
+diff -Naur ../libecwj2-3.3/configure.in ./configure.in
+--- ../libecwj2-3.3/configure.in	2006-07-02 20:13:30.000000000 -0500
++++ ./configure.in	2009-03-16 14:00:14.000000000 -0500
+@@ -32,17 +32,6 @@
+ # Build some standard absolute include paths for the build
+ 
+ MAIN_INCLUDE_DIR="$PWD/Source/include"
+-LCMS_INCLUDE_DIR="$PWD/Source/C/NCSEcw/lcms/include"
+-
+-# Run configure in the LCMS directory (using LCMS's own configure script) 
+-# to initialise any platform dependent settings that it uses 
+-# (e.g. typedefs for int types)
+-
+-THISDIR=$PWD
+-cd Source/C/NCSEcw/lcms
+-chmod +x configure
+-./configure
+-cd $THISDIR
+ 
+ # Build LIBECWJ2_DEFS with all defines, and NCSGnuSystemDefs.h with defines
+ # needed by apps building against libecwj2.
+@@ -89,7 +78,7 @@
+ LIBECWJ2_CFLAGS="$PLATFORM_CFLAGS"
+ LIBECWJ2_STATIC_LDFLAGS="$PLATFORM_STATIC_LDFLAGS"
+ LIBECWJ2_SHARED_LDFLAGS="$PLATFORM_SHARED_LDFLAGS"
+-LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR -I$LCMS_INCLUDE_DIR"
++LIBECWJ2_INCLUDES="-I$MAIN_INCLUDE_DIR"
+ 
+ rm -f Source/NCSBuildGnu/NCSGnuSystemDefs.h
+ echo "#ifndef LIBECWJ2" > Source/NCSBuildGnu/NCSGnuSystemDefs.h
+
diff --git a/sci-libs/libecwj2/libecwj2-3.3-r1.ebuild b/sci-libs/libecwj2/libecwj2-3.3-r1.ebuild
new file mode 100644
index 000000000000..dac12edc821c
--- /dev/null
+++ b/sci-libs/libecwj2/libecwj2-3.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/libecwj2-3.3-r1.ebuild,v 1.1 2010/01/02 02:58:42 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="Library for both the ECW and the ISO JPEG 2000 image file formats"
+SRC_URI="mirror://gentoo/${P}-2006-09-06.zip"
+HOMEPAGE="http://www.ermapper.com/ProductView.aspx?t=28"
+
+LICENSE="ECWPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="media-libs/lcms"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nolcms.patch
+	rm -rf Source/C/libjpeg Source/C/NCSEcw/lcms
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/include
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /usr/share/doc/${PF}/
+	if use doc; then
+		dodoc SDK.pdf || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}
diff --git a/sci-libs/libecwj2/libecwj2-3.3.ebuild b/sci-libs/libecwj2/libecwj2-3.3.ebuild
deleted file mode 100644
index 77af120c3bbb..000000000000
--- a/sci-libs/libecwj2/libecwj2-3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/libecwj2-3.3.ebuild,v 1.5 2009/09/23 20:07:53 patrick Exp $
-
-DESCRIPTION="This library offers read (decompress) and write (compress) for both the ECW and the ISO JPEG 2000 image file formats"
-SRC_URI="mirror://gentoo/${P}-2006-09-06.zip"
-HOMEPAGE="http://www.ermapper.com/ProductView.aspx?t=28"
-
-LICENSE="ECWPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-
-src_install() {
-	into /usr
-	mkdir -p "${D}usr/include"	# hack to enable install of include files
-	make DESTDIR=${D} install || die "make install failed"
-	if use doc; then
-		dodoc SDK.pdf
-	fi
-	if use examples; then
-		dodir /usr/share/doc/${P}/
-		cp -r ./examples/ "${D}"usr/share/doc/${P}/
-	fi
-}