Use the platfor-specific path; bug #185294

(Portage version: 2.1.3.5)

3 files changed, 33 insertions, 2 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/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 .