Version bump.

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

4 files changed, 166 insertions, 4 deletions

diff --git a/media-libs/icclib/ChangeLog b/media-libs/icclib/ChangeLog
index ae4cb50f1de9..25815cd66ec5 100644
--- a/media-libs/icclib/ChangeLog
+++ b/media-libs/icclib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/icclib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/icclib/ChangeLog,v 1.1 2012/05/20 19:48:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/icclib/ChangeLog,v 1.2 2012/09/24 02:30:27 radhermit Exp $
+
+*icclib-2.14 (24 Sep 2012)
+
+  24 Sep 2012; Tim Harder <radhermit@gentoo.org> files/icclib-2.13-make.patch,
+  +icclib-2.14.ebuild, +files/icclib-2.14-make.patch:
+  Version bump.
 
 *icclib-2.13 (20 May 2012)
 
diff --git a/media-libs/icclib/files/icclib-2.13-make.patch b/media-libs/icclib/files/icclib-2.13-make.patch
index 0ba8a4bc0baf..620b52044e27 100644
--- a/media-libs/icclib/files/icclib-2.13-make.patch
+++ b/media-libs/icclib/files/icclib-2.13-make.patch
@@ -41,15 +41,15 @@ diff -ruN icclib.orig/Makefile.UNIX icclib/Makefile.UNIX
 -CCFLAGSDEF   = -DUNIX -c
 -CC        = cc $(CCFLAGS) $(INCFLAG)$(STDHDRS)
 +CCFLAGSDEF   = -DUNIX -fPIC -c
-+CC        = cc $(CCFLAGSDEF) $(CFLAGS) $(INCFLAG)$(STDHDRS)
++CC        = $(CC) $(CCFLAGSDEF) $(CFLAGS) $(INCFLAG)$(STDHDRS)
  CCOF      = -o 
 -LINKFLAGSDEF = -lm
 +LINKFLAGSDEF = -shared
  LINKLIBS  = 
 -LINK      = cc $(LINKFLAGS) $(LINKLIBS)
-+LINK      = cc $(LINKFLAGSDEF) $(LDFLAGS) $(LINKLIBS)
++LINK      = $(CC) $(LINKFLAGSDEF) $(LDFLAGS) $(LINKLIBS)
  LINKOF    = -o 
-+LIBU      = cc $(LINKFLAGSDEF) $(LDFLAGS) -Wl,-soname,libicc.so.$(ICCLIB_SOVERSION) $(LINKLIBS) -o
++LIBU      = $(CC) $(LINKFLAGSDEF) $(LDFLAGS) -Wl,-soname,libicc.so.$(ICCLIB_SOVERSION) $(LINKLIBS) -o
  
  .SUFFIXES:
  .SUFFIXES: .c $(SUFLIB) $(SUFOBJ) $(SUFEXE)
diff --git a/media-libs/icclib/files/icclib-2.14-make.patch b/media-libs/icclib/files/icclib-2.14-make.patch
new file mode 100644
index 000000000000..14e69f17f21a
--- /dev/null
+++ b/media-libs/icclib/files/icclib-2.14-make.patch
@@ -0,0 +1,114 @@
+--- icclib_V2.14/Makefile
++++ icclib_V2.14/Makefile
+@@ -3,13 +3,13 @@
+ # by uncommenting the appropriate line:
+ 
+ # Microsoft C++, WinNT setup
+-include Makefile.WNT
++#include Makefile.WNT
+ 
+ # IBM C++, WinNT setup
+ #include Makefile.IBMNT
+ 
+ # Generic UNIX setup
+-#include Makefile.UNIX
++include Makefile.UNIX
+ 
+ # Apple OSX
+ #include Makefile.OSX
+@@ -32,7 +32,7 @@
+ 
+ 
+ icc$(SUFOBJ): icc.c icc.h
+-	$(CC) $(CCOF)icc$(SUFOBJ) icc.c
++	$(CC) $(CFLAGS) $(CCOF)icc$(SUFOBJ) icc.c
+ 
+ libicc$(SUFLIB): icc$(SUFOBJ)
+ 	$(LIBU) $(LIBOF)libicc$(SUFLIB) icc$(SUFOBJ)
+@@ -41,39 +41,39 @@
+ 
+ # Separate for executables
+ iccstd$(SUFOBJ): iccstd.c icc.h
+-	$(CC) $(CCOF)iccstd$(SUFOBJ) iccstd.c
++	$(CC) $(CFLAGS) $(CCOF)iccstd$(SUFOBJ) iccstd.c
+ 
+ 
+ icctest$(SUFOBJ): icctest.c icc.h
+-	$(CC) $(CCOF)icctest$(SUFOBJ) icctest.c
++	$(CC) $(CFLAGS) $(CCOF)icctest$(SUFOBJ) icctest.c
+ 
+ icctest$(SUFEXE): icctest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 	$(LINK) $(LINKOF)icctest$(SUFEXE) icctest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 
+ 
+ lutest$(SUFOBJ): lutest.c icc.h
+-	$(CC) $(CCOF)lutest$(SUFOBJ) lutest.c
++	$(CC) $(CFLAGS) $(CCOF)lutest$(SUFOBJ) lutest.c
+ 
+ lutest$(SUFEXE): lutest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 	$(LINK) $(LINKOF)lutest$(SUFEXE) lutest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 
+ 
+ icclu$(SUFOBJ): icclu.c icc.h
+-	$(CC) $(CCOF)icclu$(SUFOBJ) icclu.c
++	$(CC) $(CFLAGS) $(CCOF)icclu$(SUFOBJ) icclu.c
+ 
+ icclu$(SUFEXE): icclu$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 	$(LINK) $(LINKOF)icclu$(SUFEXE) icclu$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 
+ 
+ iccdump$(SUFOBJ): iccdump.c icc.h
+-	$(CC) $(CCOF)iccdump$(SUFOBJ) iccdump.c
++	$(CC) $(CFLAGS) $(CCOF)iccdump$(SUFOBJ) iccdump.c
+ 
+ iccdump$(SUFEXE): iccdump$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 	$(LINK) $(LINKOF)iccdump$(SUFEXE) iccdump$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 
+ 
+ iccrw$(SUFOBJ): iccrw.c icc.h
+-	$(CC) $(CCOF)iccrw$(SUFOBJ) iccrw.c
++	$(CC) $(CFLAGS) $(CCOF)iccrw$(SUFOBJ) iccrw.c
+ 
+ iccrw$(SUFEXE): iccrw$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+ 	$(LINK) $(LINKOF)iccrw$(SUFEXE) iccrw$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB)
+--- icclib_V2.14/Makefile.UNIX
++++ icclib_V2.14/Makefile.UNIX
+@@ -1,7 +1,7 @@
+ # Generic UNIX setup
+ 
+ SLASH     = /
+-SUFLIB    = .a
++SUFLIB    = .so
+ SUFOBJ    = .o
+ SUFEXE    = 
+ CMDSEP    = ;
+@@ -18,21 +18,22 @@
+ STDHDRSDEF = /usr/include
+ 
+ MAKEU     = make
+-LIBU      = ar -r
+-LIBOF     = -o
++LIBOF     = 
+ RANLIB    = echo
+ AS        = as
+-CCFLAGSDEF   = -DUNIX -c
+-CC        = cc $(CCFLAGS) $(INCFLAG)$(STDHDRS)
++CCFLAGSDEF = -DUNIX -fPIC -c
++CFLAGS    += $(CCFLAGSDEF) $(INCFLAG)$(STDHDRS)
++CC        = cc
+ CCOF      = -o 
+-LINKFLAGSDEF = -lm
++LINKFLAGSDEF = -shared
+ LINKLIBS  = 
+-LINK      = cc $(LINKFLAGS) $(LINKLIBS)
++LINK      = $(CC) $(LINKFLAGSDEF) $(LDFLAGS) $(LINKLIBS)
+ LINKOF    = -o 
++LIBU      = $(CC) $(LINKFLAGSDEF) $(LDFLAGS) -Wl,-soname,libicc.so.$(ICCLIB_SOVERSION) $(LINKLIBS) -o
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c $(SUFLIB) $(SUFOBJ) $(SUFEXE)
+ 
+ .c$(SUFOBJ):
+-	$(CC) $(CCOF)$*$(SUFOBJ) $<
++	$(CC) $(CFLAGS) $(CCOF)$*$(SUFOBJ) $<
+ 	
diff --git a/media-libs/icclib/icclib-2.14.ebuild b/media-libs/icclib/icclib-2.14.ebuild
new file mode 100644
index 000000000000..87e5b9526a85
--- /dev/null
+++ b/media-libs/icclib/icclib-2.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/icclib/icclib-2.14.ebuild,v 1.1 2012/09/24 02:30:27 radhermit Exp $
+
+EAPI=4
+
+inherit base multilib toolchain-funcs
+
+MY_P="${PN}_V${PV}"
+DESCRIPTION="Library for reading and writing ICC color profile files"
+HOMEPAGE="http://freecode.com/projects/icclib"
+SRC_URI="http://www.argyllcms.com/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+ICCLIB_SOVERSION="0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-make.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" ICCLIB_SOVERSION=${ICCLIB_SOVERSION}
+}
+
+src_install() {
+	mv libicc.so libicc.so.${ICCLIB_SOVERSION} || die
+	dolib.so libicc.so.${ICCLIB_SOVERSION}
+	dosym libicc.so.${ICCLIB_SOVERSION} /usr/$(get_libdir)/libicc.so
+	dobin iccdump
+	dodoc Readme.txt todo.txt log.txt
+
+	insinto /usr/include
+	doins icc*.h
+}