Revision bump adding EAPI 5 and python-r1 support, and fixing the tests. Thanks to Nikoli, maksobotan, and mgorny; bug 466248.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

6 files changed, 146 insertions, 13 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index c20c041dfba1..ca13313f59d7 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.150 2013/02/18 22:12:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.151 2013/05/05 21:00:10 dilfridge Exp $
+
+*lcms-1.19-r1 (05 May 2013)
+
+  05 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> +lcms-1.19-r1.ebuild,
+  +files/lcms-1.19-fix-python3.2.patch,
+  +files/lcms-1.19-fix-swig-destructor.patch, metadata.xml:
+  Revision bump adding EAPI 5 and python-r1 support, and fixing the tests.
+  Thanks to Nikoli, maksobotan, and mgorny; bug 466248.
 
   18 Feb 2013; Zac Medico <zmedico@gentoo.org> lcms-2.4.ebuild:
   Add ~arm-linux keyword.
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index ccb7a681d043..b07234258e37 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX lcms-1.19-disable_static_modules.patch 578 SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e SHA512 fba391dd6d69122217cdcde985d2154dfc2fd9b9aed5a50a013248e024ee54fe07a98acf917fd0e889578616512a2bdf155f0cbe782795e406d96a90b10bbb33 WHIRLPOOL d40c77d18ab5249252e4cadd5b6e2e40c1e43c0f761758908f2afa06d29dce41d56de52d33fe043d7441180c40ca572571fb7c27b87c43406991e5f1e25ff22c
+AUX lcms-1.19-fix-python3.2.patch 1098 SHA256 aee8200bdb7106b5aaa0df92590de5c857319373e95c7617fb7541717ce3219a SHA512 6b8bda2f792ca5afe65e62c618613583763904f7a6994c6f60d38285b4b823ebf92fd449afedb2b57d61ddf7edc82f277dbe4bb7b8dc8e751ccbe1d0970c8277 WHIRLPOOL 842dcb6bd64505bc0f05ebf8a621514a643ae8bdd8ead4d4fa5e827e0dbc4f7b39a65863cbfb0d4bfe047f06da1b00ef7837b107de574b3b5e8f6150983e0c3f
+AUX lcms-1.19-fix-swig-destructor.patch 345 SHA256 ac8ade0b3e45fd934b88925256fe6e729bb4b6b38f3ad896dfef3dc11e8b52a7 SHA512 00d1b2dd2ed32d4848c726e6616a4cb9caccc9ad410c796d400bd8566938854100c0c94e8db6446ab00a3dfef610406b6eca1f7a288a37b7249f3f98e9653a91 WHIRLPOOL 4247ffa55abdec48e98926ee174101bf440d00e81cf7c3fe2940693de04697d692b2538ca5b5d3917a5f1ea8ba72f2d964bcc7b7b49bc484bd18e6e260332484
 AUX lcms-1.19-implicit.patch 1308 SHA256 327eb96faafac582362f57800727896bd5c2206a7bb150f12ef7787e84f3ddd9 SHA512 120db0ea4c5a77563dffef55507a8e7fa172ee73ad3943b6ba55c4a01f4a0a2ae21794f4775d58f0d8ba6b5fbdc28c461622416981683063ff746db9a38c724b WHIRLPOOL df45ecfc6fe36db90c676e25f053b370af466648e36e752acfd9f5c0d5acc25a445bf0a8a476f0913ca5c7f0304940c3af35bf56c021fa34045cfdb1e52419bc
 DIST lcms-1.19.tar.gz 927752 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 SHA512 85a55ad0673f0df2aaa80d18caa50314319f8da5ee4d84eed919059d0dad9861d684ef6353ce0ec6f9892a4603ce8e8e12f84d46858e23f52846b8aefd3cf449 WHIRLPOOL cb6bcb5497798ff2fa86ff433eae6afea38408306345156da6103aa8af6fc0d48fa1d730c5958c027ba06ea023236328bcb00be60f600d987d060625385c820b
 DIST lcms2-2.3.tar.gz 4461644 SHA256 3ea177bbde947be5b9256b817d1cf98ab9c67c558b35703c48f5dbf8e0afafe4 SHA512 a1aca550ce357b04379b3faa7c67b90a6c5fbbbc08b5a47f8802b3588846322f5c3bca53e66212c303927721ac43cac28ef0522298ae1b4f734d84a48eebc9d0 WHIRLPOOL 8bfdc5bf638589d69908e75a95cd148e0b656dc92a4020aba56a9e9f17b417a78cb0e863a8c3beafd0830a206dd440b817f03c20d64b8fb3457d9e95f23061c9
 DIST lcms2-2.4.tar.gz 4293291 SHA256 2a514d10eff26901505c191a15c2588c751eb7fb86577118f6c235aff0be37e8 SHA512 935105c396ca3ff00db6be18feb94883e40312010866e029d0bbdf340f7bc354d24d09697335304f8dfc93d41a4d10f7d186721553959091cee962610441bb6e WHIRLPOOL a99a2880176361d341a4a8b8bceb05e0f752462c4b9a57552d94520e425316fb844f3c9a91cccebaca3c426e7382dc4de45ccc12989959e4e3047030135a47fb
+EBUILD lcms-1.19-r1.ebuild 2602 SHA256 f69507c959b6d8ee23d7642c0e518e8027d8d603b0a09557e732bc469220a1a6 SHA512 b75655ff23b18e551942e02d599ca33e626260f7778db5c1611872c7652bbec6f33d7a058382765847c8b6d4adf2528466f31708483ab13a0d0cf8993d07017a WHIRLPOOL cd4a8dfccb3edcd0edb68caec8301bef713f75cf3cf08de1c439b8e29b31eac8bc85a428f0f4c2addfd792e5b6c30c4b9a94153cdfa0c0d0c9cafa01a903f82c
 EBUILD lcms-1.19.ebuild 2698 SHA256 bb3e6c6c612f3e8dad07ed3fba091d29e0b231113b43cbb0bda06f39569aee86 SHA512 f90b6ad8a151aa127458c0e2e9afa14185327760223c4781207e1fd9bf2603a10fce24fd4abe5f44026bb2379bddd6d708fca8fc510dbc3aaa79ca4123e6d400 WHIRLPOOL 8c3ca10a1587faf217b07aa2a153cbb37a42b6c716082ae9da96547b055b9a6795a5f0843adc6a15651ff5e2bfea36e3ec35b2da41c4cbb5f5e0407a656ee57c
 EBUILD lcms-2.3.ebuild 1186 SHA256 d32f2edbae7c9faf13e3fb385d577bb1eaa31c1b155984796a4b66687138bdcc SHA512 19b7b31dee13c098087d1cf8f3ad735c8c540926260605cfac36f8a3ca818eeeecc1f60b990cb60ec29b0fcc18d18e4386ec9ba4445453ee31d75ca5becbb58e WHIRLPOOL 6891b2cfb2965eab9bc8a83664333c28a10a9266c22f75e7a5e7d26e4238f1784e8cf41853cc284efffba61b87c26be16e058960f1f0023a70068518b8af84d9
 EBUILD lcms-2.4.ebuild 1209 SHA256 9da63d7d51c6b19ea29869b505ffb7352ecac6eb344514caafb9475bb1c24e7e SHA512 ee71c12c1a51f0205072028c37c6c09eccb5b6a04c05e655fb01c307af8d78701ee55972182384d9d3514cd410206e3caf6655bc7125b93078135e880bdf826a WHIRLPOOL 57a2e77f2f8412cb98961ba7547754b4961dc92ce334d83ca9a73d4131670443f32bf83a59cc92bba25e95b21b4120f3aecf42c6ff6da3fc9af6919d7f075fe5
-MISC ChangeLog 18307 SHA256 7e36979c19d9cdc2faa795000e4844eefbbf0296284caa92e6eac27db2f003fc SHA512 09cc8159cd796c438610480ba1e9bb989f309511141c8caebf57947d5005d7806384519a6e005d51352a7c26095700a75ae8eb991701b6424da67736e9bb2f2f WHIRLPOOL 869fefc5d3150f441a54a76d64231e8b8a4db634af582f282dc80b15577e2fa8ac28ce502d9ded287396af3ef2fd220f649dd9f4e63b6dd77803d89a1f88d985
-MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlEip04ACgkQ/ejvha5XGaO6hgCeMvLMIH155IVqEcZ6HtZVu/i/
-bNAAn3HRwkmF/BE9hYDW/aE65DdxJN0A
-=S2+R
------END PGP SIGNATURE-----
+MISC ChangeLog 18649 SHA256 b8e257abbf0e4e4ce6d0c0f003a477cb2baaae8c456a72765193bd6800025b03 SHA512 ffbf9360bbf6193421066bf86e40bfce258788f7a89884b400bca67bd887d24abc5d94247d11bc85e164e7a370f47205aad33ff5112fc827eb9cc47ced5bbc28 WHIRLPOOL 6b76cb18ea401bf4307aa4da9faa6db081f38d0469ce7a1209d78c830a885dbcd946874378cea579e67791855c23ef54b8f90cd720a30cb6a882134f439c957b
+MISC metadata.xml 181 SHA256 52a52842b305fc897a5ece53a3a20b47cb5ebe36c0c88fb3f85a364cd6b940bc SHA512 c7ea81982732777e7327796168feab32e77deabba9941b8b81d3a910d906cfd3ecd5ed1a8cae255ff2472caac54fceb42c495b6e0fb7472b3679fee8dd5d56d4 WHIRLPOOL 796f93928011276727e5242b3a1398c8fc5be4c453cc24880553feb5681c28171b3c8a17da4881c28be02bdbe96e06050ba4cef9fd531ebbd22b900149651c6a
diff --git a/media-libs/lcms/files/lcms-1.19-fix-python3.2.patch b/media-libs/lcms/files/lcms-1.19-fix-python3.2.patch
new file mode 100644
index 000000000000..4388634141e6
--- /dev/null
+++ b/media-libs/lcms/files/lcms-1.19-fix-python3.2.patch
@@ -0,0 +1,17 @@
+--- configure.ac.orig	2013-04-18 00:04:25.940676322 +0400
++++ configure.ac	2013-04-18 00:06:34.233675498 +0400
+@@ -93,10 +93,10 @@
+   AM_PATH_PYTHON(2.2,PYTHON_OK='yes',PYTHON_OK='no')  

+   if test -n "$PYTHON"

+   then

+-	LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`

+-	LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"`

+-    LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`	

+-	LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"`

++	LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`

++	LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1))"`

++    LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"`	

++	LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,1))"`

+ 	AC_CHECK_FILE([$LCMS_PYINCLUDE/Python.h],PYTHON_OK='yes',PYTHON_OK='no')

+     AC_SUBST(LCMS_PYEXECDIR)

+     AC_SUBST(LCMS_PYINCLUDE)

diff --git a/media-libs/lcms/files/lcms-1.19-fix-swig-destructor.patch b/media-libs/lcms/files/lcms-1.19-fix-swig-destructor.patch
new file mode 100644
index 000000000000..af8e690d81ec
--- /dev/null
+++ b/media-libs/lcms/files/lcms-1.19-fix-swig-destructor.patch
@@ -0,0 +1,11 @@
+--- python/lcms.i.orig	2013-04-18 00:11:48.179673481 +0400
++++ python/lcms.i	2013-04-18 00:11:56.769673425 +0400
+@@ -191,7 +191,7 @@
+ 				ZeroMemory(v, sizeof(COLORW));

+                 return v;

+         }

+-        ~COLORB() {

++        ~COLORW() {

+                 _cmsFree(self);

+         }

+ 		const char* __repr__() {                

diff --git a/media-libs/lcms/lcms-1.19-r1.ebuild b/media-libs/lcms/lcms-1.19-r1.ebuild
new file mode 100644
index 000000000000..03f90b225e04
--- /dev/null
+++ b/media-libs/lcms/lcms-1.19-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r1.ebuild,v 1.1 2013/05/05 21:00:10 dilfridge Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} )
+
+# autoreconf needs to update python macros for py3 support.
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+
+inherit autotools-utils python-r1
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="http://www.littlecms.com/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="jpeg python static-libs tiff zlib"
+
+RDEPEND="
+	tiff? ( media-libs/tiff:0 )
+	jpeg? ( virtual/jpeg )
+	zlib? ( sys-libs/zlib )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-1.3.31 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable_static_modules.patch"
+	"${FILESDIR}/${P}-implicit.patch"
+	"${FILESDIR}/${P}-fix-swig-destructor.patch"
+	"${FILESDIR}/${P}-fix-python3.2.patch"
+)
+
+DOCS=( AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT )
+
+src_prepare() {
+	# Breaks out-of-source build, only corresponding .in file is needed
+	rm include/icc34.h || die 'rm failed'
+
+	autotools-utils_src_prepare
+
+	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
+	if use python; then
+		cd python || die
+		bash swig_lcms || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with jpeg)
+		$(use_with tiff)
+		$(use_with zlib)
+	)
+	autotools-utils_src_configure --without-python
+
+	if use python; then
+		python_parallel_foreach_impl \
+			autotools-utils_src_configure --with-python
+	fi
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		# Note: it intentionally passes evaluated 'parent' dir.
+		python_parallel_foreach_impl \
+			autotools-utils_src_compile -C python \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
+
+src_test() {
+	cp "${S}"/testbed/*icm "${BUILD_DIR}"/testbed/ || die
+
+	autotools-utils_src_test
+}
+
+src_install() {
+	autotools-utils_src_install \
+		BINDIR="${ED}"/usr/bin
+
+	if use python; then
+		# Note: it intentionally passes evaluated 'parent' dir.
+		python_foreach_impl \
+			autotools-utils_src_install -C python \
+			top_builddir="${BUILD_DIR}"
+
+		python_parallel_foreach_impl python_optimize
+	fi
+
+	insinto /usr/share/lcms/profiles
+	doins testbed/*.icm
+}
diff --git a/media-libs/lcms/metadata.xml b/media-libs/lcms/metadata.xml
index 1fa0ca569505..7037f6cce958 100644
--- a/media-libs/lcms/metadata.xml
+++ b/media-libs/lcms/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>printing</herd>
+<herd>python</herd>
 </pkgmetadata>