Added some extra logic to create correct symlink for multilib profiles.

Package-Manager: portage-2.0.51-r13

3 files changed, 42 insertions, 26 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index f235feb9afb0..c7d4c62a5f74 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.183 2005/01/18 14:28:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.184 2005/01/19 13:29:52 cryos Exp $
+
+  19 Jan 2005; Marcus Hanwell <cryos@gentoo.org> kdelibs-3.3.2-r2.ebuild:
+  Added some extra logic to create correct symlink for multilib.
 
   18 Jan 2005; Gregorio Guidi <greg@gentoo.org> kdelibs-3.4.0_beta1.ebuild:
   Added optional support for spellcheckers.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9fc23a8e60bd..44c37d962fd2 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,36 +1,46 @@
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dff2404043f0b92070d67e2cd97850fa kdelibs-3.2.0.ebuild 2402
+MD5 b41d41fe083dd8b72a58f7ac6e7f0312 kdelibs-3.3.2-r2.ebuild 3148
+MD5 520abbe6032373c2dced7e9b0f912fa8 kdelibs-3.3.0.ebuild 3002
 MD5 4eb7815d6274026b1a56ee11e63a3e21 kdelibs-3.2.2-r1.ebuild 2611
+MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
 MD5 642ea25c3926d67609ba51eb5730114f kdelibs-3.2.3-r5.ebuild 2940
 MD5 a51b93f216240e553772012917943a10 kdelibs-3.4.0_beta1.ebuild 2643
-MD5 dff2404043f0b92070d67e2cd97850fa kdelibs-3.2.0.ebuild 2402
-MD5 2c0cb12da53349c06a23f2485a3f2fe9 kdelibs-3.3.1-r2.ebuild 2986
-MD5 f2881f4649ba7e0489903b78055fc60c ChangeLog 29661
-MD5 63180e2d5b72210c08540cac204a4306 kdelibs-3.3.2-r2.ebuild 2985
-MD5 520abbe6032373c2dced7e9b0f912fa8 kdelibs-3.3.0.ebuild 3002
-MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882
-MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
-MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68
-MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
-MD5 bf08eeb18202c2640f0184420af9a19e files/digest-kdelibs-3.3.0 68
+MD5 a4bd6b4ff904ca862da9b9bbee85183a ChangeLog 29800
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 1c47f3fafa13fcf69ce4cb1c474f5643 files/digest-kdelibs-3.4.0_beta1 69
 MD5 a9840789442b11d5f1d4418b706566a7 files/post-3.3.1-kdelibs-kio.diff 1324
-MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
-MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
-MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68
+MD5 0046c691fa833b2ff8d7eac15312a68b files/post-3.2.3-kdelibs-dcopserver.patch 4751
 MD5 a639b7b592f005e911c454a0a8c9c542 files/post-3.2.3-kdelibs-kioslave.patch 549
-MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68
-MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
-MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
-MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
 MD5 52e0e955204a77781505d33b9a3c341d files/post-3.2.2-kdelibs-ktelnetservice.patch 974
-MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
+MD5 285676023bab94666dfec728231cfcd1 files/kdelibs-3.2.2-su.cpp.diff 383
+MD5 ca12b078c7288ce9b2653e639a5b3ee0 files/post-3.2.3-kdelibs-kcookiejar.patch 5384
+MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
 MD5 1b408d4b494b5328cd15768991836fd8 files/post-3.3.2-kdelibs-kio.diff 1442
-MD5 054d042dcbccec0be386a2d26d30a5b1 files/reference-list-rev-1.3.diff 526
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.1-kdelibs-htmlframes2.patch 989
 MD5 fed1da1d587ee8aa43b3affc1fa9a35b files/post-3.3.1-kdelibs-khtml.diff 2447
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.1-kdelibs-htmlframes2.patch 989
+MD5 3f21fc4e8ddbf79459bfa8f2df1a5e15 files/animated-gif-fix.patch 317
 MD5 1f98b72b586d9a988c47dfce380dd8b6 files/post-3.2.3-kdelibs-htmlframes2.patch 975
-MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
+MD5 ee0b53e6fbaea17ae3543638dc09ca34 files/digest-kdelibs-3.2.0 68
+MD5 bf08eeb18202c2640f0184420af9a19e files/digest-kdelibs-3.3.0 68
+MD5 345ce2e01cfdfa4754c47894c0271dcc files/post-3.2.3-kdelibs-kstandarddirs.patch 1417
 MD5 fe67157b26a8cdf5bcfa1898cdf3b154 files/post-3.3.2-kdelibs-kioslave.patch 663
+MD5 054d042dcbccec0be386a2d26d30a5b1 files/reference-list-rev-1.3.diff 526
+MD5 7cebc1abb3141287db618486fd679b32 files/post-3.2.2-kdelibs-kapplication.patch 882
 MD5 76ef4c7d472a5e3659219ee223f12cb5 files/qt-3.3-printfix.patch 333
+MD5 0ce7a1c41d2bc3c102c6c4d4a6ba8f0b files/post-3.2.3-kdelibs-kio.diff 1315
+MD5 6176dc207f5ba91edee9b04ab111afe5 files/digest-kdelibs-3.2.2-r1 68
+MD5 57b3bdaa9934d84f320c1aa40a56afe4 files/digest-kdelibs-3.2.3-r5 68
 MD5 a874ee470150aacab38ec42463cac4dd files/digest-kdelibs-3.3.1-r2 68
+MD5 dd2a593a052e2ea070d310e38297bec0 files/digest-kdelibs-3.3.2-r2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD4DBQFB7mDFntT9W3vfTuoRArjUAJjhLW1HwNUdJ0gwqlaDcCc+B4zLAKCbSy5f
+CirdehwSA+5dTyCGZ28VhQ==
+=9QhA
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild
index f20d8f7df0b9..54ddcf13f247 100644
--- a/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild,v 1.4 2005/01/12 03:50:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r2.ebuild,v 1.5 2005/01/19 13:29:52 cryos Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3
@@ -81,7 +81,10 @@ src_install() {
 
 	# needed to fix lib64 issues on amd64, see bug #45669
 	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
-
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
 
 	if ! use arts ; then