Use the platfor-specific path; bug #185294

Package-Manager: portage-2.1.3.5

4 files changed, 55 insertions, 10 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 388b64e478aa..c1456165c9d2 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/lcms
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.79 2007/08/08 22:31:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.80 2007/08/14 18:55:28 dang Exp $
+
+  14 Aug 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/lcms-1.17-multilib.patch, lcms-1.17.ebuild:
+  Use the platfor-specific path; bug #185294
 
 *lcms-1.17 (08 Aug 2007)
 
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index d840fe647ac7..c5ce27a88f05 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lcms-1.15-bsd.patch 340 RMD160 e4119079acc099cb80a77a292f3ecf012eefe2b8 SHA1 570e6ee2b2e036b1f0038f978d53cf82519c9c77 SHA256 570feeae39f50732468292088b8c9c8189b3074f0f9629897864a73eb2d759b7
 MD5 4592d7079a1fcbfa678b1aa306069df1 files/lcms-1.15-bsd.patch 340
 RMD160 e4119079acc099cb80a77a292f3ecf012eefe2b8 files/lcms-1.15-bsd.patch 340
 SHA256 570feeae39f50732468292088b8c9c8189b3074f0f9629897864a73eb2d759b7 files/lcms-1.15-bsd.patch 340
+AUX lcms-1.17-multilib.patch 1695 RMD160 a59505fb9b512408314339362dc79399a786f500 SHA1 cd43616031304ce31fe685fe452117d103e6bf5a SHA256 3cf451dff9470c0ee004445d919fbb1245dd05ad0ad206607e7cb0f96000a383
+MD5 5f92f0ae2b72d123145f0d9137fec447 files/lcms-1.17-multilib.patch 1695
+RMD160 a59505fb9b512408314339362dc79399a786f500 files/lcms-1.17-multilib.patch 1695
+SHA256 3cf451dff9470c0ee004445d919fbb1245dd05ad0ad206607e7cb0f96000a383 files/lcms-1.17-multilib.patch 1695
 AUX lcms.i.diff 803 RMD160 7d749a249f961fe697025991a81f60079c7fdecf SHA1 96bd4272a8b1e7798a29e9f2b8564c11ad9417ff SHA256 f54fc81e6f5a474ac4cf3c699b39e0c73cba7f645beca5b69a20c4e8a0e47c50
 MD5 e51934aa8d241036ecdb6d934b73c468 files/lcms.i.diff 803
 RMD160 7d749a249f961fe697025991a81f60079c7fdecf files/lcms.i.diff 803
@@ -22,14 +29,14 @@ EBUILD lcms-1.16.ebuild 1446 RMD160 4826b8d2388db77d3686bd8ead15a78ce8a56799 SHA
 MD5 ed50acec1c7064d986c12b5e7717ea59 lcms-1.16.ebuild 1446
 RMD160 4826b8d2388db77d3686bd8ead15a78ce8a56799 lcms-1.16.ebuild 1446
 SHA256 d8aa88dc401bec2b1a50e8edff26559ef159658fb7abaf9798ea2f68c0a08c67 lcms-1.16.ebuild 1446
-EBUILD lcms-1.17.ebuild 1484 RMD160 21294e5e0468b897507a484a64b30bc2c96d5c29 SHA1 dd1f66bbdb24c0b3819489a95cabf00156fd5ddf SHA256 316a6246185458b8382225dc34ae8d7a9e65307f288bfb7fa383ea859dd6de26
-MD5 59d45ebd483c2663f55cab25bc3c287c lcms-1.17.ebuild 1484
-RMD160 21294e5e0468b897507a484a64b30bc2c96d5c29 lcms-1.17.ebuild 1484
-SHA256 316a6246185458b8382225dc34ae8d7a9e65307f288bfb7fa383ea859dd6de26 lcms-1.17.ebuild 1484
-MISC ChangeLog 9530 RMD160 2567c711a31c3144eab2388accf7e71b19e459a4 SHA1 8003bfae1fe337c98776a4701236048a86d17c95 SHA256 96e0d7475c1b9dda53d4db9127cf2702c410b13fe4e77965e2d2d9340e7772bb
-MD5 2545db88870e1be2a5b1a548473cbad1 ChangeLog 9530
-RMD160 2567c711a31c3144eab2388accf7e71b19e459a4 ChangeLog 9530
-SHA256 96e0d7475c1b9dda53d4db9127cf2702c410b13fe4e77965e2d2d9340e7772bb ChangeLog 9530
+EBUILD lcms-1.17.ebuild 1560 RMD160 b08a06adfe7f0753d209dd4ab3dbc7d658f0d90a SHA1 b99680d4846b9d8f2bc013175e2bb8a253506c02 SHA256 67bc0f629cc5ad5c3a2e24fc245372cc9713999a5f69328c39ff87c77e437670
+MD5 fc28ca2a9700db407087bca831e82f61 lcms-1.17.ebuild 1560
+RMD160 b08a06adfe7f0753d209dd4ab3dbc7d658f0d90a lcms-1.17.ebuild 1560
+SHA256 67bc0f629cc5ad5c3a2e24fc245372cc9713999a5f69328c39ff87c77e437670 lcms-1.17.ebuild 1560
+MISC ChangeLog 9677 RMD160 9f30a1a7d0d33f9c652ebf0f180b0959ca3f870c SHA1 aa885650205798781eb97c44656fc97918c5ce26 SHA256 abd036ae2406906d8d2ac6ee89212a79b8fc97a5c55891645c3940845832e45e
+MD5 d38eea5d53eadabb982c401a36eaf2a7 ChangeLog 9677
+RMD160 9f30a1a7d0d33f9c652ebf0f180b0959ca3f870c ChangeLog 9677
+SHA256 abd036ae2406906d8d2ac6ee89212a79b8fc97a5c55891645c3940845832e45e ChangeLog 9677
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -46,3 +53,10 @@ SHA256 e38e67c66b53740accaacfdfd3f94ac679c69833c380582b36bbd809f3172b8c files/di
 MD5 7fd4998e14657fbbc8be7b47113d7cd7 files/digest-lcms-1.17 229
 RMD160 5cd2fcbc94481ee262c21b1cc94cc386591bb753 files/digest-lcms-1.17 229
 SHA256 30c4de663b98d62ea909ebbf91761a12f4c131257c5d5410a8a6654ef93423cd files/digest-lcms-1.17 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGwfrWomPajV0RnrERAt6YAJ9QaKvJKmePlwOruZqEmYFhUZoreACfRUzs
+wrMgwqeDHz3JxoVnTGzs6co=
+=4NN4
+-----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/files/lcms-1.17-multilib.patch b/media-libs/lcms/files/lcms-1.17-multilib.patch
new file mode 100644
index 000000000000..d9544eb457e2
--- /dev/null
+++ b/media-libs/lcms/files/lcms-1.17-multilib.patch
@@ -0,0 +1,24 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN lcms-1.17.orig/configure lcms-1.17/configure
+--- lcms-1.17.orig/configure	2007-07-27 06:10:39.000000000 -0400
++++ lcms-1.17/configure	2007-08-14 14:43:28.000000000 -0400
+@@ -5436,7 +5436,7 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" 
+   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()"`
++	LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(True)"`
+     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)"`
+ 	as_ac_File=`echo "ac_cv_file_$LCMS_PYINCLUDE/Python.h" | $as_tr_sh`
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN lcms-1.17.orig/configure.ac lcms-1.17/configure.ac
+--- lcms-1.17.orig/configure.ac	2007-01-31 06:35:24.000000000 -0500
++++ lcms-1.17/configure.ac	2007-08-14 14:42:19.000000000 -0400
+@@ -94,7 +94,7 @@ then

+   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()"`

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

+     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')

diff --git a/media-libs/lcms/lcms-1.17.ebuild b/media-libs/lcms/lcms-1.17.ebuild
index 1d6dbac404df..86f4bf4a2839 100644
--- a/media-libs/lcms/lcms-1.17.ebuild
+++ b/media-libs/lcms/lcms-1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.17.ebuild,v 1.1 2007/08/08 22:31:14 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.17.ebuild,v 1.2 2007/08/14 18:55:28 dang Exp $
 
 inherit libtool eutils multilib
 
@@ -24,6 +24,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Fix multilib-strict; bug #185294
+	epatch "${FILESDIR}"/${P}-multilib.patch
+
 	# We need to refresh this for the BSD's
 	cp /usr/share/libtool/install-sh .