Fix compilation problem with multilib no-symlink profiles.

Package-Manager: portage-2.1_pre7-r4

4 files changed, 31 insertions, 12 deletions

diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index ba48ffd87c38..2acd132776c2 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.21 2006/04/06 03:25:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.22 2006/04/10 11:27:42 herbs Exp $
+
+  10 Apr 2006; Herbie Hopkins <herbs@gentoo.org>
+  +files/superkaramba-3.5.2-multilib-python.diff, superkaramba-3.5.2.ebuild:
+  Add patch to fix compilation problem with multilib no-symlink profiles.
 
   06 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -superkaramba-3.5.0.ebuild, -superkaramba-3.5.1.ebuild:
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index 544c5c4129e9..3cd7bdcf5438 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d95d9f716ade32c6459644b1a4fd40fe ChangeLog 2942
-RMD160 3320c82482965526f88a2fb51576d868af76e705 ChangeLog 2942
-SHA256 b32ff93a1a9bfb910add394362f1ceb10786a3c0b168fc60513214a797771c1a ChangeLog 2942
+MD5 83053640e9a485b8048b17bb3c7de4da ChangeLog 3139
+RMD160 8ec56685b4ba40baafd86c7b5e390099769e03fe ChangeLog 3139
+SHA256 37f248e569b36a40c89ddef54c7144e34dc92f47321afa28fe4067813fd8a3fa ChangeLog 3139
 MD5 215488123a318281ac9687845ce3f247 files/digest-superkaramba-3.5.2 250
 RMD160 20ae70b7b70bbb1c67a9f18e73a62d86e3002e51 files/digest-superkaramba-3.5.2 250
 SHA256 f1a2913c3ce615ce4c875426f15752336f065f7ff67391e6243d280db059ec8b files/digest-superkaramba-3.5.2 250
 MD5 82cc61148d380f77c98ea1b8bc88dbef files/superkaramba-3.5.0-fbsd.patch 4218
 RMD160 43bf8584d9a95f0ab77dd5d79c66d7a986b3c36d files/superkaramba-3.5.0-fbsd.patch 4218
 SHA256 f3bb7dc2ae578c9b871b9f1449909d021590a2dd2641e25e400bbac7b225c821 files/superkaramba-3.5.0-fbsd.patch 4218
+MD5 3237a56852013bc24798bb85765ce1db files/superkaramba-3.5.2-multilib-python.diff 750
+RMD160 ae92c9d58e4f591e15deb838589cd4f029ef3590 files/superkaramba-3.5.2-multilib-python.diff 750
+SHA256 9630fe0bc19aa79aa2b84b5758c98acf406344b95ad1258b3deace5951fbabab files/superkaramba-3.5.2-multilib-python.diff 750
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 880c8fc41c59cccf1960d2bcb84ee0f0 superkaramba-3.5.2.ebuild 487
-RMD160 60b4977a7c86bc3929bf2ebc7f3db3624bcd91e2 superkaramba-3.5.2.ebuild 487
-SHA256 ee0acc55a4d5d614a9518a2e147b28b57782dbf79848b5b1ecdf0959ef425c19 superkaramba-3.5.2.ebuild 487
+MD5 2e05a6e986fd1965fa752e516e279a06 superkaramba-3.5.2.ebuild 531
+RMD160 91af212dd65cd019363813ef44439c6a8f14da2c superkaramba-3.5.2.ebuild 531
+SHA256 a3458b6a538c3ef9a76e22b1a2fab1e9dc1fa3381cb4c11f6bb4d4ad90ccff26 superkaramba-3.5.2.ebuild 531
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFENInUAiZjviIA2XgRApjdAKDTWD/+swDFIUV0xN12kxlCmryxagCfYvB0
-0JJGtPFyHu5UuY7eR48PA2Y=
-=rDtj
+iD8DBQFEOkFN2G5bA0cA/ScRAtRRAKCpGKfMvdaKqQh4TQLSe3fEGYpBcwCggRVx
+i10aFZUl/oyBJ1Y8JremQm0=
+=6jaF
 -----END PGP SIGNATURE-----
diff --git a/kde-base/superkaramba/files/superkaramba-3.5.2-multilib-python.diff b/kde-base/superkaramba/files/superkaramba-3.5.2-multilib-python.diff
new file mode 100644
index 000000000000..7527d38577b7
--- /dev/null
+++ b/kde-base/superkaramba/files/superkaramba-3.5.2-multilib-python.diff
@@ -0,0 +1,12 @@
+diff -urN superkaramba-3.5.2.orig/admin/acinclude.m4.in superkaramba-3.5.2/admin/acinclude.m4.in
+--- superkaramba-3.5.2.orig/admin/acinclude.m4.in	2006-03-17 21:43:31.000000000 +0000
++++ superkaramba-3.5.2/admin/acinclude.m4.in	2006-04-10 12:14:31.000000000 +0100
+@@ -4557,7 +4557,7 @@
+ 
+ PYTHONINC=-I$python_incdir
+ 
+-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
++python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/lib /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+ AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
+ if test ! -r $python_libdir/libpython$version.so; then
+   AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
diff --git a/kde-base/superkaramba/superkaramba-3.5.2.ebuild b/kde-base/superkaramba/superkaramba-3.5.2.ebuild
index a0707960e456..0d3d1263e8a4 100644
--- a/kde-base/superkaramba/superkaramba-3.5.2.ebuild
+++ b/kde-base/superkaramba/superkaramba-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.2.ebuild,v 1.2 2006/03/28 01:21:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.2.ebuild,v 1.3 2006/04/10 11:27:42 herbs Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -13,4 +13,4 @@ IUSE=""
 
 RDEPEND="!x11-misc/superkaramba"
 
-
+PATCHES="${FILESDIR}/${P}-multilib-python.diff"