Backport multilib support to lcms:0, as required by older versions of wine.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 129 insertions, 15 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 5b4758543cc5..2bd8d2884512 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.172 2014/06/10 00:51:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.173 2014/06/18 17:09:35 mgorny Exp $
+
+*lcms-1.19-r2 (18 Jun 2014)
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> +lcms-1.19-r2.ebuild:
+  Backport multilib support to lcms:0, as required by older versions of wine.
 
   10 Jun 2014; Mike Frysinger <vapier@gentoo.org> lcms-1.19-r1.ebuild,
   lcms-1.19.ebuild, lcms-2.3.ebuild, lcms-2.4.ebuild, lcms-2.5-r1.ebuild,
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 095cc22766e6..6b11b4c36508 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -11,28 +11,31 @@ DIST lcms2-2.4.tar.gz 4293291 SHA256 2a514d10eff26901505c191a15c2588c751eb7fb865
 DIST lcms2-2.5.tar.gz 7000396 SHA256 6727772b44470a2111dba53b9ce4c952b87e7d1b72a31c5ebdf44ba6eb0aa72b SHA512 c41daee7bb366eed940283d3760e5862d8d2bb6e465d1f712123449a2013431321155c8500dba4c4393a1e49fdef0bc2f5399e1573f0295cc0dac3fe88c60853 WHIRLPOOL 72512f300b03344da9a932ad10b723d830a549a977dcf6750b0d88ddd217693e93ae05b23e239ff984acf34375ea8895b187be57dff14448253881a7b8dd2414
 DIST lcms2-2.6.tar.gz 4583389 SHA256 5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 SHA512 af2dd8829a5d8b280688bc247812829c885368951d385a23a1596cf8d0a7aed627c8faa35740073efc51a86ef5c900fc9bdb9dcdfad885fb8b1eae16953f9041 WHIRLPOOL 4fe1be53c48b0928bd474e05613c443eea49570a074d22b71863c485408523116927655b57d86bcb02aca85d9e06c0e26d9ee46bc7c4d746e91e951212de9e59
 EBUILD lcms-1.19-r1.ebuild 2610 SHA256 3d230082928ef515e07758aaf25077785dfd048460e0bd89dcb295b79e4510cb SHA512 c69884dd438306ae423750935514a3a52ad9d7c10fa3c930677c4e00e44e6fcb23a896ee25c541984a4168d35926ed9724e4f08f6c747da78ee0706ac83bea63 WHIRLPOOL ba380deb3733eb8f652ae3443de8e5b3627239679ce260eb739abe4e8b646367898f468c5a84ded25aa91fb975050d7c8c4959e37752a4af027d0a1c359a9034
+EBUILD lcms-1.19-r2.ebuild 2782 SHA256 c254b85328f30cc472593cc5f77c60eac74e092fad646f2a3dbe41237ff30dda SHA512 04f59810d8e14f24f69ee7082d949c91928cd761d832c225b15c5b3fea564c38822bd348dfee718d6656672980cbcf1c8f326e013ead8e2a849fc2527bc78d5b WHIRLPOOL d6937044d2d9420aa214a396616de591fc7959487a834de7326b7bbce4579cda25eb39a81b48dd7ececad3b072ca6506fe7434de6117cae03dc890ec80534094
 EBUILD lcms-1.19.ebuild 2710 SHA256 0e21a730735f70db5d58b7eb16f453bc50f5953c5cbc2eb86eb73eb8d528f479 SHA512 1ef0381d435d04e93fc330eb892f743c48a986f368914a6c452c0575417f1119344e65f906d84f565ecfe8ac9d0283fae2e9bccc6d5f2545a51cd8138846562f WHIRLPOOL 8fcbc34c9e4814b0720cf487442b3ee32632900c8b8f4024f40d87f65b9d38ac4e9c515e1ba82446166899cb106d0c0b6bf64e9d974e5614f65757c0ee0642e2
 EBUILD lcms-2.3.ebuild 1199 SHA256 2a48cdc394f86efd05a30227deef20095077dd719266834d93c91df867a926ed SHA512 bfecb719eeb71da7c0ffd65d69064e73a174de4c58160f852be59f720957b42c86d9e85c8f4000d945314b61a5240828af1628f394f0cffae26d1aa25e581ac6 WHIRLPOOL 8de76ba66d15ea0f9d3509a17a72ebd817c04db87893449a12ac20fb3987d16609f5eed626f45a276d062afa80ef2a41a5507e80cf165e163deed1e3f2c9811a
 EBUILD lcms-2.4.ebuild 1223 SHA256 9913a16c3eb028e2b7801e91ceeac15d6097c1b9a772396a7f57144655473aca SHA512 4f4c781f0133bb8b7299e8840709ef955a228c0c5d6ab1d4faf043da910c8be80c6f43e77ce79b79819ca062e8f0df4e2963f14e6d1428230eb76e1b64edf6f2 WHIRLPOOL c30e5ae288833732fa8284d72da967eb6d448ff3d2a1554556b122ca262c7fdc422a1542c25628afd3c56dba7c3e51c824bb442b5139e6f61a4bfb5de88d5557
 EBUILD lcms-2.5-r1.ebuild 1354 SHA256 7ca77e9bc746709d78bd47bd3357452756b0d45bbaee69cc0b3ae91232a4ecab SHA512 1fa689d56db1a0368e09de22e7ed2ec474861819aed7c6c5e5dab9b5e70c7e63a642e3403d79ca557fab86c3353907622d1333edd254291621a62917f3dc2230 WHIRLPOOL bbf6c12761d27bae753eab76e32f5243c428bc4fbe5e3b7f51baef8d688cc4b851471071e34a0317a04f46562c1e2c02bdbcd58e32b36825e6abaf19c8521bab
 EBUILD lcms-2.5.ebuild 1140 SHA256 84d16fbd4e4d820e01350167face78804aab8c8fb32ce2e178d2f4b0c2eefc48 SHA512 00b536ca98f6f2c0a91360b79ff97b310744fc396e798feed98e68361e1e9d8675c23a959d721047af16bc3c63c2aedfd8367954027946cacf355124a244f984 WHIRLPOOL 2f1a9af5ec48cbe4f25c3e678ad5e07813a838b9bb87d8ffa8ab03e38e52376fa59dd9efbc2fe53033dff9ed03ec8da7d50e95f8d4eac67c2259684e7956cab1
 EBUILD lcms-2.6.ebuild 1383 SHA256 dfdc1b56e28729895c4a1664464fdf94356baf496dcd6c0a499b5893054eacd1 SHA512 13cfa756a23311403208e0691cefbe8bea8d80fd56937cc47a30a0e34e4dbf0bc36dd1236b8515195c95546c69b2f458d413275ddfc4d4fba172beb62d7cd0e9 WHIRLPOOL 4192c346fb897fc45dc3d08894a303a82bd2d14d92fc833db995aeac77cf1534cf7161db62225795bbfeeb5d40b41f3f0dc4798190cf8e3025de03370b250d8a
-MISC ChangeLog 21360 SHA256 d0b044faae1d4d0597a120cc65459ff71dbac7424ce96327c991de155077ac62 SHA512 50dcb262891909e31021bff70259ec7a40214028869ebda2789d8acc1e4bec7aacfe5abcb2187ca9e836d6d40f2c0e4e8338b10bdf6de5dfa5afec34de065328 WHIRLPOOL f651124d5180e0e6a5b725ac10bfcb4807c2ed325618d7e40df7d82a9867aa32d6449ec72f8e62dcf812b1dc7b06a7091326adf42edd3671b4c9c565168d6baa
+MISC ChangeLog 21540 SHA256 a306ff240114c80a5682ff6b628c130bd68faeddd5b59a83d2e2939e2defcb8a SHA512 49ec540a26533cb4ed7595ec4106a15893b68bee5456abb1cb603770af36d5e200ede8bafe798d9c6487ca8187bbaa0444decc31dac3131b6a76593b04e1edb5 WHIRLPOOL 40f8ba41baac3a20c1b8a2c801efbe5dd8c717f3807ce3e8854eb98bb680ad733d90977ebb43cf90e498db30e02a4edd2228c250122d9f78705648f2328a562c
 MISC metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 SHA512 3b5d653ba492267297653f61d148b859d366b53d9c29670f175c84622f6ad64141e93e30db08e24f87a75e6fcf1ab187cc8783b72aa2ee1709cf1ef6c7c75e22 WHIRLPOOL 2516e48e62e1604c152e32a6336881cb02f3599c23856a220019bc807611880480bfe4af7a60a2bb45efbb93faf89141ccfd9fde69044677604bf976dfb65988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTllZ/AAoJEPGu1DbS6WIAM7QP/3VYgZTY9Hk+aZYSqd3RGNn1
-IZ53j97lA404dThmbUxb29oCh8UeC/1EHJg7bqRO2J25aKIGwnJwhWRVQZvd1QI9
-3Q5ofeLZBSycT1tApZJgzTYUAp97B5nHv9kURKhZOHHMew8+TXykZnjUTMWoYcqA
-YgG+7QO94Tq8A5xZ0TDLahNXu9TerhDjipLX1HNYExDdneixBa6EizHiqszAxjw8
-crjnM6+6LIPdeDXLCKvOamGrmyFXwSkDTIPYVczsv8R5G+jnsoB2KKzQOlrDbqRs
-HElaQCVS/fk+DoSykOvDQOsITJhq1bMtrN7QJ5ehP0nwpNFY+OaI62t4Bo30ibMq
-/jZBCmIdXpma+49MtLZyep2nKsSg3cHUoYYWFONXCdek4p+3XGphnLHKB+ECoCcv
-T4gSGRk74tmSyCQRLxu5cX6rrPeOUw9QdT4GANEL74H432ACpln2LuAaD8Z1eZj8
-Pi8w014xHflqk/244y6HpY6X4m6ghXdska2Uz1kxNKVyYtcNGc+WRIxGQTwZze98
-h7YkSQwjnhwukWE2VtWzjoSpc8wF99wbwg6wog8QT+ZcltiU1k4nYFivF+v0DG+t
-+Vi3+xhftQPHGfRCWuZLpJYsgYZx+bdW2RR5JKtdzWwRPb77cDo6w/IFP7dZ2Ly8
-TmY0py+zHMLz7xcVM1gF
-=Ahyk
+iQJ8BAEBCABmBQJTocfRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO/WMP/1mcV668NSy9LdXGQgJaQ59U
+kRI9YybIJgDmNEGAmzdwop3T2ryxpytvm4RNPWMxx7A7X+MH+sgZ6Ksja/WCRwz2
+PBW7niIPr5KpxiQYVEk/ufV3jIB8Fpd+EhqdBrV/hIQXcpL9m2mudYMdk0bqMVKQ
+bGCp+oDe3hfJNIqBRea066tBFdUDie3gCCiGkwYuTd7rKBbds2MNEKKQzX0sr+/e
+C6EMWWB2hcsSKruCmSPam0eQtvS0Ym/ejdCfPoPrz91nZnrQsbTrMYf8RDAyPIzh
+nE8tFd6LNRZ9fOPHd7XVVSZvnFVs7YsD0VjB99XvosKyojTe2lOTW6kc4H67jlJu
+YZzq5q4X3IpHgXOGzLvcGlKK08K+ACBqsWChGGRG8xl8KNaMSPU2hu1gQpvROtYn
+bTp14nhSU4S9DAygjzIh3Cj1VmCpYc/meWDNFQRu+zQ17A0slAT79rqCgFeegWIM
+tYbRDCeW9qhe9VPrX1g8Z0qnuNiC5cI+yreC1SQ7nXZC0Z9BAHHWBogl1yJ5+3tt
+JdKrCseJwGlt2G8zVoH14syWDXltP/PxJwFoEHsMobBP69z0ycHTp0O1IpFhoK0u
+H4uk3V6jh60jeUFYbqAwf+CQ+PO7iDIXoIJfx4YE5b91ihrjbD68Zz4GJQAWvvcP
+FilzKOztxBSQqysc3+Jv
+=JIfB
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/lcms-1.19-r2.ebuild b/media-libs/lcms/lcms-1.19-r2.ebuild
new file mode 100644
index 000000000000..4c049738df47
--- /dev/null
+++ b/media-libs/lcms/lcms-1.19-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19-r2.ebuild,v 1.1 2014/06/18 17:09:35 mgorny Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+# autoreconf needs to update python macros for py3 support.
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-multilib 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 ~arm64 ~hppa ~ia64 ~m68k ~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[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	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"
+)
+
+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
+}
+
+multilib_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 multilib_is_native_abi && use python; then
+		python_parallel_foreach_impl \
+			autotools-utils_src_configure --with-python
+	fi
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && 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
+}
+
+multilib_src_test() {
+	cp "${S}"/testbed/*icm testbed/ || die
+
+	default
+}
+
+multilib_src_install() {
+	emake DESTDIR="${ED}" BINDIR="${ED}"/usr/bin install
+
+	if multilib_is_native_abi && 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 "${S}"/testbed/*.icm
+}
+
+multilib_src_install_all() {
+	DOCS=( AUTHORS README.1ST INSTALL NEWS doc/{LCMSAPI,TUTORIAL}.TXT )
+
+	einstalldocs
+	prune_libtool_files --modules
+}