Version bump.

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

5 files changed, 188 insertions, 9 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/Manifest b/media-libs/icclib/Manifest
index e0c65c2d7382..bf315cddf56c 100644
--- a/media-libs/icclib/Manifest
+++ b/media-libs/icclib/Manifest
@@ -1,5 +1,22 @@
-AUX icclib-2.13-make.patch 1441 RMD160 e5f8e61bc7f4cf49dba458d6ce8c14710ac655df SHA1 0c002fd83a7067af6ee2e4f1f8b4221cf6107a0f SHA256 930d6c15ed78112d4f8be0c0d3cb0c2216e99a0de6938d091ad8786c3b7954be
-DIST icclib_V2.13.zip 158453 RMD160 ca4b2393e6c9ed0266f3f5f8ad376a42c4e5195c SHA1 633d229a0dd64b2efaf54d12d7b2959dc1b59b76 SHA256 ef22636855986a193bb80e90c149973f9db4433e73c8fa0f3837a8c08b930f0a
-EBUILD icclib-2.13.ebuild 948 RMD160 38cd95dc25d5897737667c1c9e9285522ddfae0f SHA1 0dae3f0e1159b4f901388460c587f9f8f85d46ac SHA256 1fe56d27842cdfe6bfb1bde94554afaa54ff9fb106a325c8c6c4b99b466302d8
-MISC ChangeLog 481 RMD160 86d868fe1d791fdbaacc3af2c14f179698cda2ea SHA1 6c12246ee97de232cbd6f2b3ec25870012f2e896 SHA256 7dc4e167c24a4f5e4982d4a85192b7971d9b3d74d78b7be5c62e32b5753940d9
-MISC metadata.xml 183 RMD160 742d207064a264462b7cd2cf5d56ea0824664293 SHA1 ffd0c7c71afa90153b3f7a9ae704a10551cc0646 SHA256 22e6c830ad92f15c7f3b9200f048e8b8ce6083526b2038e3b6f955bb0d3c4e25
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX icclib-2.13-make.patch 1450 SHA256 3f837298a59f4960da9072391af24adfd3c94e2a84d28b899fdaa03ddec07fbb SHA512 269c809a26338394bd29d50168f6d32f0d80e37155ae84cdc8fa12b4a1bc5c28d039690130c41f3369ac9f872cdc40579ce272e907333d1f0cd2eaacef4c52f0 WHIRLPOOL 22b2e56dd31056b2734a16e49ef64a0380995ef127511aebc271471cf5c8ce5905606bdebcf6f4bfed0e8da4b1a971d680766ee0310c205fdfd988533bde8376
+AUX icclib-2.14-make.patch 3074 SHA256 8ecebc6556780aa9c375d67bb0654763866e2932a09510483f5bc90f50153757 SHA512 e2245b6f7aa24fcb135e8ce7a4332b6a689822c6429cf48cab5cd61285e80c72ff50adb6d8e691b948e45b9dd5d3df42935b810e1a25aba4f2d9d51ac9b9a1eb WHIRLPOOL f48c348876d04b5bcec56b4aa24f257ce54156052275910ad71d9f5f2f3c041020cdd9ecad607c78e9d9f78d02734ff21ffb2cdc9d3903ca9bdfed6e70842934
+DIST icclib_V2.13.zip 158453 SHA256 ef22636855986a193bb80e90c149973f9db4433e73c8fa0f3837a8c08b930f0a
+DIST icclib_V2.14.zip 158606 SHA256 e07cf9d3d7aec7ed4b1944a890300eba2272f2ce32deb51fb72c36e218f5a0aa SHA512 ed038c8655968c794491f30c295ef115900bfcc2e8bfd8607f12f73d6f2236fc339c1ed53a364524478273097ab9065a372bb26f38231bfc6dc02773a11546a3 WHIRLPOOL 698bb4b139e87f7d6a7ec9e531ee788c0ae3edd9e5ead6d237f49b697a72ea0d4d642a7ca83b7665f901977a2f1d965aa9be96b00a1a0f4bb98e6e613698bfee
+EBUILD icclib-2.13.ebuild 948 SHA256 1fe56d27842cdfe6bfb1bde94554afaa54ff9fb106a325c8c6c4b99b466302d8 SHA512 6a7e6006d8a2bb9290b6fa57845d7f78a5b10a2aa6d26557a12cc74072e146cacfcb57bd0f5fdb1b64e2a72b52fc0a9f3c2941b1e47cea7e36d8b71c54fde7a9 WHIRLPOOL dd9dec7f49b6fc3aa4c7e09e58f9852f0a31b4b565c8807b7526aa79a96444fa3b7c3570460026dafca6f344191f2da8e1d4af502ce79b976b3e3d2ad3418d05
+EBUILD icclib-2.14.ebuild 956 SHA256 41e3f64c77c5e2c7e6424e599b8d32836181ad03ff8f86042828a68c0dcf3656 SHA512 0760e22e4c6172fa5552af65a20f6e909a14060c9eef0069fa6a9c3f561c6d19b28c4f73becca2eb20ef67658ef02629c6c9673ba0d3965532fc014e189f0019 WHIRLPOOL 29c49660e1fa511652181158405b498458011d522da61b2571252754e9218dac9eb5453334df6e623422cf51a5bd5be7a831d11ec456b009355c9cb03afd570f
+MISC ChangeLog 659 SHA256 c32c95e5dccc0255044b97a8e3e04bcf25aced20d47c87b4b49cf8554a257574 SHA512 9ca7ed338216c902800ab28a85ccfd01da4bfd22f3c53cca8a9a920a87f0a3ae32ca4777136ba0e26be10b821495a0f542d7924b4a73ff2f913b87b0d50b8ab6 WHIRLPOOL aaa5f435c7eb2ab95b40f63c0b570668b34ab59bb9388d2e1ba3e1ea3bc388f22c0dba746b719a4e1d3e145f1ddadd3831da2399082c18c33ba970a5a26ebb12
+MISC metadata.xml 183 SHA256 22e6c830ad92f15c7f3b9200f048e8b8ce6083526b2038e3b6f955bb0d3c4e25 SHA512 c82dfe93c79566f0ea83dbed713e20da78f37171950fa37976f7825054160497892e3cdb755099c1a54a270fd0a1548e1e99784419274db8cada52f5c080665f WHIRLPOOL 0f3901b069bfef99d3253ae70e648cded29e9eedf6796b8b8ae7bd5abbf6cfedc037035b7990f18b20d8c275ec1f3360ae9f97ff7be237aa4d7e203e59ed050c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQX8XVAAoJEEqz6FtPBkyj6XgH/A8eBCCcdDdEYdqmedG5k2th
+ecGX5WtlaUbmg3jd2HmfyJEe6sa+qI+QPonrWHTxnGQPFw0f35iRDsceC2bjJ9l+
+1kla+5mVCOPFagLmdooWEe+KBV1PkHbCYHxFcZOuZGETwxS8iLmoQ/KYdx8D8b6f
+uLe4aPG8/He6nqxb82xSP2THcdG1U+eTYijtxJC26Tw6E+8rxZGK6djLgUTZ4+ZM
+c9lOTrr1Tsg8uNYpym0bNxlETByM30xJ0Ie7HpeW96y3dQCsG+JeMmDVQ2VEfw3N
+OBjqPO1IAzqyAUjyoKXyaFSgM4THZsDrgr51z0+8DY61TtbqqOHHReS4F4jnAys=
+=Qc+D
+-----END PGP SIGNATURE-----
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
+}