Multilib goodies.

(Portage version: 2.0.51-r13)

3 files changed, 33 insertions, 15 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index cc1ed37b2683..251e5f4b1f9b 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.183 2005/01/12 23:52:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.184 2005/01/18 05:11:08 eradicator Exp $
+
+  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> qt-2.3.2-r2.ebuild,
+  qt-3.3.3-r2.ebuild:
+  Multilib goodies.
 
   12 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> qt-2.3.2-r2.ebuild,
   qt-3.3.3-r2.ebuild:
diff --git a/x11-libs/qt/qt-2.3.2-r2.ebuild b/x11-libs/qt/qt-2.3.2-r2.ebuild
index 81cfc079e859..98538bc6cac2 100644
--- a/x11-libs/qt/qt-2.3.2-r2.ebuild
+++ b/x11-libs/qt/qt-2.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/x11-libs/qt/qt-2.3.2-r2.ebuild,v 1.2 2005/01/12 23:52:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r2.ebuild,v 1.3 2005/01/18 05:11:08 eradicator Exp $
 
 inherit eutils
 
@@ -86,6 +86,9 @@ src_install() {
 	ln -s libqutil.so.1.0 libqutil.so.1
 	ln -s libqutil.so.1 libqutil.so
 
+	Past this point just needs to be done once
+	is_final_abi || return 0
+
 	# includes
 	cd ${S}
 	dodir ${QTBASE}/include
@@ -98,7 +101,11 @@ src_install() {
 	# List all the multilib libdirs
 	local libdirs
 	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/qt/2/${libdir}"
+		libdirs="${libdirs}:${QTBASE}/${libdir}"
 	done
 	dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/50qt2
+
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
+	fi
 }
diff --git a/x11-libs/qt/qt-3.3.3-r2.ebuild b/x11-libs/qt/qt-3.3.3-r2.ebuild
index f62a76fbba82..1ee4de5ea1d2 100644
--- a/x11-libs/qt/qt-3.3.3-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.3-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/x11-libs/qt/qt-3.3.3-r2.ebuild,v 1.2 2005/01/12 23:52:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r2.ebuild,v 1.3 2005/01/18 05:11:08 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -134,8 +134,8 @@ src_compile() {
 	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
 		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
-		-dlopen-opengl || die
+		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
+		-fast ${myconf} -dlopen-opengl || die
 
 	export QTDIR=${S}
 
@@ -185,6 +185,17 @@ src_install() {
 		ln -s libqt-mt.so libqt.so
 	fi
 
+	# plugins
+	cd ${S}
+	plugins=`find plugins -name "lib*.so" -print`
+	for x in $plugins; do
+		exeinto ${QTBASE}/`dirname $x`
+		doexe $x
+	done
+
+	# Past this point just needs to be done once
+	is_final_abi || return 0
+
 	# includes
 	cd ${S}
 	dodir ${QTBASE}/include/private
@@ -198,10 +209,14 @@ src_install() {
 	# List all the multilib libdirs
 	local libdirs
 	for libdir in $(get_all_libdirs); do
-		libdirs="${libdirs}:/usr/qt/3/${libdir}"
+		libdirs="${libdirs}:${QTBASE}/${libdir}"
 	done
 	dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3
 
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
+	fi
+
 	dodir ${QTBASE}/tools/designer/templates
 	cd ${S}
 	cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates
@@ -255,12 +270,4 @@ src_install() {
 			"s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \
 			"s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die
 	fi
-
-	# plugins
-	cd ${S}
-	plugins=`find plugins -name "lib*.so" -print`
-	for x in $plugins; do
-		insinto ${QTBASE}/`dirname $x`
-		doins $x
-	done
 }