Multilib goodies.

Package-Manager: portage-2.0.51-r13

4 files changed, 40 insertions, 22 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/Manifest b/x11-libs/qt/Manifest
index 80bac5edac35..25f2737f57fa 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 959932485a6c491dd51ed99f0d976341 ChangeLog 30693
+MD5 cf6b2361f4bce0e7176c91caf872fd7b ChangeLog 30813
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 f48889277f11c39d5f2160b262e7c314 qt-2.3.2-r1.ebuild 2289
-MD5 dd2127b3c7bc12b24621d172b6a075af qt-3.2.3-r1.ebuild 5159
 MD5 0c35ff70fb6ff95611499d6fb69d8afc qt-3.3.1-r2.ebuild 5745
 MD5 fbe7f8bc183824f9c17974b1a493c94d qt-3.3.2.ebuild 6895
 MD5 7daec76f47482903184ed2b6d6d5640f qt-3.3.3-r1.ebuild 8039
 MD5 3f30d4e96664ba2574dfb069b708f4a1 qt-3.3.3.ebuild 6897
 MD5 6eabb11b45974186ee77341995c7b215 qt-4.0.0_beta1-r1.ebuild 5702
 MD5 13c659d1e84ee9edb8e9c64d08fb06a9 qt-4.0.0_beta1.ebuild 4777
-MD5 2fc3522ad56999fa1dd99fd8f72c96c4 qt-3.3.3-r2.ebuild 8171
-MD5 25fa7abc414dec2597f1d53575a1434e qt-2.3.2-r2.ebuild 2595
+MD5 3d1cc787b98b33e20bdb4768bd8e8ecc qt-3.3.3-r2.ebuild 8375
+MD5 2a5d402b9d5ceff465069a1651f3b329 qt-2.3.2-r2.ebuild 2765
 MD5 71338b6ba782422f79354dae6a3336e0 qt-4.0.0_beta1-r2.ebuild 5761
+MD5 dd2127b3c7bc12b24621d172b6a075af qt-3.2.3-r1.ebuild 5159
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 ad4921b9f10a62c1e211d064f5c7fd9a files/44qt4 121
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
@@ -48,7 +48,7 @@ MD5 5754b897216dcf52901cfb4de6770d6e files/digest-qt-4.0.0_beta1-r2 99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5bjOArHZZzCEUG0RAosnAJsEEOa40zPOzrrbdwG7uM3X7DkdgQCeOxGy
-NTQzjo0kZP9azOsQwE/gQss=
-=/q+O
+iD8DBQFB7Jp2ArHZZzCEUG0RAtXxAJ0QS142PTmlfkjvmaP2Ryv90Je+4QCfesm6
+dIo92C5PGqi7xkqwgB6Zx5I=
+=3Jct
 -----END PGP SIGNATURE-----
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
 }