Version bump. Update to EAPI 4, add doc USE flag, and add test phase.

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

4 files changed, 97 insertions, 2 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index d93b3825e949..1af02e8255ab 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.125 2011/02/26 18:18:37 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.126 2011/06/10 23:05:23 radhermit Exp $
+
+*lcms-2.2 (10 Jun 2011)
+
+  10 Jun 2011; Tim Harder <radhermit@gentoo.org> +lcms-2.2.ebuild,
+  +files/lcms-2.2-header.patch:
+  Version bump. Update to EAPI 4, add doc USE flag, and add test phase.
 
   26 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   lcms-1.19.ebuild, +files/lcms-1.19-disable_static_modules.patch:
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 69ed44e0bcf9..e758fad6b8bd 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,9 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lcms-1.19-disable_static_modules.patch 578 RMD160 258765bda276cfe1e4a73111ac094962096570ca SHA1 3d54655f2f78a506559c3ebd5a93bb80bd6cce5e SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e
+AUX lcms-2.2-header.patch 226 RMD160 9543dbf51ea82f40ff8c236ffe07db19bb48c72f SHA1 08234a777a49f059bb84c87b685d631824f725ff SHA256 e9a38177648562a8d3f4fe85fb3ffbdda35f7c6597e91fc28fa8e6770267cf20
 DIST lcms-1.19.tar.gz 927752 RMD160 530615c061dccdcb64d75c6fab148dd565bb6c91 SHA1 d5b075ccffc0068015f74f78e4bc39138bcfe2d4 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
 DIST lcms2-2.0a.tar.gz 3449841 RMD160 610e7f92556757e963a3769e166b5a68cdd8629e SHA1 b9d3939764e3b3f33cb9b9f7cffd43520227db9e SHA256 6deaf78611f5978ff58aa85efc37cf070b6ffb7106486b894914c4fc548d054f
 DIST lcms2-2.1.tar.gz 3752136 RMD160 de88e912feb8f4e94e29e9d575b2867ec1b967e9 SHA1 0ce856a004068ff6e22f9f2d7b94a11b9b469bf9 SHA256 8b367bd60add7806c9aac970594dae636c24ba28dc774c00f8067644994e9c30
+DIST lcms2-2.2.tar.gz 4193353 RMD160 8e35a351c9549e53ebe4f120cdc5cf35e8b693fc SHA1 55ae4884a92c7fbd491c118aa3b356814b1014df SHA256 b6f2a1be1a2b7ca54bfab69b32242d383a176637f161eeeaef451bd9fc1195cc
 EBUILD lcms-1.19.ebuild 2447 RMD160 f63ee9c525464258ea4a9ab792ea821865ded602 SHA1 a3c297ea5fbaecbe558143cbd68e7a78757bbae1 SHA256 a5c52ea3d29ed0a271d6cc7529c4eb7a87b4cf8163c2e400b19cb289f629c224
 EBUILD lcms-2.0a.ebuild 1187 RMD160 d85c909ca8bbf0e112d305ec954b63030af4acde SHA1 40869412a64aa3ca4c814d86b12f0a7bfa4046ee SHA256 870841cc551478bcb5f7ad41c9abbfc2ff5d23ebd3f4cc97018e666ad0b9f4fa
 EBUILD lcms-2.1.ebuild 1149 RMD160 9a9a453214ec91af8b078e7672aef9b1aa61e443 SHA1 dafc59e7f99418e74e54e0a58103a3500735914b SHA256 e70fd14bbccdbbc60b9394d685710425549bfee430ae956620104da6967db3e4
-MISC ChangeLog 15016 RMD160 56794b8a27e0d71cfb74e7dfbcf7f067c43f37f3 SHA1 3e29949f931f96d1060674255217befcd0623997 SHA256 ac4e083476527b9c9f26daa5b122fa14db6cbbe0e09b64583404973f5de2d2c0
+EBUILD lcms-2.2.ebuild 1185 RMD160 340aedf96c851ab55a0d4d4a7f09c57a2fcb4544 SHA1 5e810749111adf9935e3c133b91de560f1676d84 SHA256 b30525ca76ac4eb5e58974f5e6173fcdc7c931f42a6d015951619811daf40d00
+MISC ChangeLog 15214 RMD160 49290a129ce26b4fc2de9b0f9f36d35eb6332bf9 SHA1 16a892fb644c7d9a3fb70e59da4b3e04882de09b SHA256 ecc3ec8a4b7bd3ed166911aa34ec96cec4ed48d1130067ffcac3eddaaf2248f0
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJN8qNAAAoJEEqz6FtPBkyjGokIAKDaIaYkdL5kAUnS67o+OBAR
+TX0EDRc6lMaKK+wrQm58Uzo8gsdz5+Tg8jfistt5y37mwZrl3HHhq6d3vMN9ptu7
+qcA2r2i9+A3YpFh4iwil05ybbbFEAk4ZG0bnMPDwqSzOHarwmd9JV14ElgSEXY+1
+Xg+rMmiNrTOSbKAK9rvRuPp/pifJbglC2t83PmKOONEjzQqTiWQ84W2U9+Ta1OpF
+K9oDzKsV8SEm/ABeDloSKDAgCzCXJVUCQDpNjwFHeo/eAmIMJ9b7eJ+Gf2b766oz
+2aoqN9J411X8jyk/+9DyBH+kUqoCEWKNHB9gLRtn7dXEh1ma3mVK9ZMt8Jewz6M=
+=dI6M
+-----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/files/lcms-2.2-header.patch b/media-libs/lcms/files/lcms-2.2-header.patch
new file mode 100644
index 000000000000..72e561c8152b
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.2-header.patch
@@ -0,0 +1,13 @@
+--- 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/lcms-2.2.ebuild b/media-libs/lcms/lcms-2.2.ebuild
new file mode 100644
index 000000000000..2a69a5018ec7
--- /dev/null
+++ b/media-libs/lcms/lcms-2.2.ebuild
@@ -0,0 +1,59 @@
+# 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.ebuild,v 1.1 2011/06/10 23:05:23 radhermit 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 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/lcms2-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-header.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 "Tests failed"
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto pdf
+		dodoc doc/*.pdf
+	fi
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
+}