From d737080e00ce14c6d145542d2fa33c58edb4853f Mon Sep 17 00:00:00 2001
From: Herbie Hopkins <herbs@gentoo.org>
Date: Wed, 10 Aug 2005 20:54:40 +0000
Subject: Multilib fixes. (Portage version: 2.0.51.22-r2)

---
 net-im/licq/ChangeLog            |  5 ++++-
 net-im/licq/Manifest             |  4 ++--
 net-im/licq/licq-1.3.0-r7.ebuild | 13 +++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'net-im')

diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 9aa9fcf19e4b..0585fe7a22fd 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/licq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.59 2005/08/03 17:44:30 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.60 2005/08/10 20:54:40 herbs Exp $
+
+  10 Aug 2005; Herbie Hopkins <herbs@gentoo.org> licq-1.3.0-r7.ebuild:
+  Multilib fixes.
 
 *licq-1.3.0-r7 (03 Aug 2005)
 
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 89e408e19300..2179d976c86e 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -4,8 +4,8 @@ MD5 0279027e445f3bb8dd80ac12b788e1e5 licq-1.3.0-r6.ebuild 4963
 MD5 0e85dd4498bf89db7c161ae23372341f licq-1.3.0.ebuild 3766
 MD5 33aad642b7982399eceef594de44d7c5 licq-1.3.0-r3.ebuild 4207
 MD5 b66e6263d95baca44239d23a900d565e licq-1.3.0-r5.ebuild 4859
-MD5 379808f7ba9943763b6bb81b5b89225a ChangeLog 9574
-MD5 16eaedee9f0cd7685600b884964a9fae licq-1.3.0-r7.ebuild 5096
+MD5 4fa614f6ba5cb86a9aea40d11293e3c5 ChangeLog 9664
+MD5 76b9e48558122f5d2775bd434850cfc8 licq-1.3.0-r7.ebuild 5455
 MD5 6ee65b2e61137a2656ef1d0deb541f1d metadata.xml 254
 MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r3 145
 MD5 2332f809f740f6e4433631eecda3335d files/digest-licq-1.3.0-r4 145
diff --git a/net-im/licq/licq-1.3.0-r7.ebuild b/net-im/licq/licq-1.3.0-r7.ebuild
index fadf3e851fd1..d0afceb9b56f 100644
--- a/net-im/licq/licq-1.3.0-r7.ebuild
+++ b/net-im/licq/licq-1.3.0-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r7.ebuild,v 1.1 2005/08/03 17:44:30 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0-r7.ebuild,v 1.2 2005/08/10 20:54:40 herbs Exp $
 
-inherit eutils kde-functions
+inherit eutils kde-functions multilib
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
@@ -67,6 +67,12 @@ src_unpack() {
 			eend $?
 		fi
 	fi
+
+	# Install plugins in the correct libdir
+	sed -i -e "s:lib/licq/:$(get_libdir)/licq/:" \
+		${S}/include/licq_constants.h || die "sed failed"
+	sed -i -e 's:$(prefix)/lib:@libdir@:' \
+		${S}/plugins/*/src/Makefile.{in,am} || die "sed failed"
 }
 
 src_compile() {
@@ -102,6 +108,9 @@ src_compile() {
 
 		use kde && myconf="${myconf} --with-kde"
 
+		# Problems finding qt on multilib systems
+		myconf="${myconf} --with-qt-libraries=${QTDIR}/$(get_libdir)"
+
 		# note! watch the --prefix=/usr placement;
 		# licq itself installs into /usr, but the
 		# optional kde/qt interface (to which second_conf belogns)
-- 
cgit v1.2.3-65-gdbad