Enable multilib support for qt-3.3.8b-r{1,2}

Package-Manager: portage-2.2_rc33-r5/cvs/Linux x86_64

4 files changed, 38 insertions, 26 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index a5c9fdcfc280..3808a063dff2 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.585 2009/06/27 19:30:37 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $
+
+  02 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  qt-3.3.8b-r1.ebuild, qt-3.3.8b-r2.ebuild:
+  Enable multilib support for qt-3.3.8b-r{1,2}
 
 *qt-4.5.2 (27 Jun 2009)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index eb42f5b1858f..b3c4fc32e2da 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1
 AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 SHA1 cda25e150541c3a2ba56ec6974e2771b8aaad0de SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d
@@ -17,10 +20,19 @@ AUX qt-3.3.8b-cjk-fix.patch 1191 RMD160 62cc0a9db2ab42b9081967033ae75b0a0eed9e93
 AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d
 DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b215788c8b SHA1 745def6250dc7f337dbb265e20bf38dcb41fd854 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
-EBUILD qt-3.3.8b-r1.ebuild 10827 RMD160 ae7bb6928438b1412c1398ffdd7a9f634e8be613 SHA1 e2f74ce93b42735f2eddf64db38299d7a8e6a811 SHA256 c5e342439f6d7da84fbaf9ea06cbedd5a07fb6fec3a42e8fae6fd0f995ab3da6
-EBUILD qt-3.3.8b-r2.ebuild 10788 RMD160 c2f6eb9f1d45b15a3eaba22b38651a99a8eed13d SHA1 8c0db15fd0074c61e53cedd51959eaee07e02b86 SHA256 663d6f265a2a93d269552f735f2d51b1a20133e36cdf2642dae7b3e7c93b4f77
+EBUILD qt-3.3.8b-r1.ebuild 10842 RMD160 1792a6bfc6a946dc5b9da2b62b9cc9a83409b132 SHA1 1e6c65520259fdfb9893c338459c5a445f94830a SHA256 18c2ebaf40f51aabe185cf923bbeb9c1672232bfd3c42fb9a2e8c340ef9627b0
+EBUILD qt-3.3.8b-r2.ebuild 10795 RMD160 243a8bc16e02f151190d714ff3cf15520139eeb2 SHA1 a513651c2a71eac2bd201f39fcf05bef5dd83a42 SHA256 5f548f3408e83d10b6184d9db84b7a22089ae6f18bd7b5bb0df478b638f024f8
 EBUILD qt-4.4.2.ebuild 868 RMD160 6cc9b0ab5112df2148f0e001cc9a6161d78e71f3 SHA1 88c8cabbdb62a3650a0e2cb7494aba9245523090 SHA256 90fb353b51bcd036e0dc2df6b68538ca1656abf10c045ca2ac1c707f23f0d288
 EBUILD qt-4.5.1.ebuild 1365 RMD160 61613317878179108dda8873062ee6d8d51ddb33 SHA1 65bbe7de8e8cbe62b02ba40acba8513f11fdd9d8 SHA256 5e891be2e79522611bc147990dc8cc28da9adecd97fdf838916a24439f6ba786
 EBUILD qt-4.5.2.ebuild 1366 RMD160 000183741947c5d94554868f1e55131f4aecad9e SHA1 23e3954078ffb5450fdb9a417ef6f527fc3d5c41 SHA256 570ef6e4bd7604dcbf2cf87e61bed03fc110e718b09303ced0ccec790c3a2fe2
-MISC ChangeLog 47738 RMD160 f023d25fa2798eed809fca8afbb1f09808b734c9 SHA1 8ce02611842fb2a17c1414f14d48ec540cb2b173 SHA256 52af7001a0079024925e6b7d08ac998c84c4bce316c051b3fd6f92148d2a319d
+MISC ChangeLog 47888 RMD160 322e645603116d0d03c2eb32b934a58ac5a57e32 SHA1 c01455f0123eaa49c83e26c8d4eecaa9aa1ea01b SHA256 8b86a61e4bbfe226f937a9fd0ab30a87d653edb4c90ff8eaa3e093251c39767a
 MISC metadata.xml 504 RMD160 1c964085340a6c32da556e0dddba675aa599ca0c SHA1 eb798d83a888e31c15db0affca952dbdaf99ba28 SHA256 b3441d2b0fedef04315e978acea237525c7ef6899b5721174f55e82dc50bbb1d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iJwEAQECAAYFAkp2CyAACgkQG7kqcTWJkGcv6wQApXXBt0U0qe1xhgE81s9fCbb1
+NZaxr/u8DSJp0di+B9dLVT5N4eESp3n7SMk2v+OTKFNfvwlwz5CD1WgDexsp1pzC
+JF1oE9EweWz8EhZusYaZWJt1fBQbvCXpT7lKrazZmHazdcqGGut9qZote51IFXD8
+QCuhV+uh2HNPzT0QBYo=
+=Y4tf
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/qt-3.3.8b-r1.ebuild b/x11-libs/qt/qt-3.3.8b-r1.ebuild
index d98651b26deb..8218e7688720 100644
--- a/x11-libs/qt/qt-3.3.8b-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.8b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild,v 1.7 2009/01/17 16:41:01 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild,v 1.8 2009/08/02 21:54:28 tommy Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -51,8 +51,6 @@ S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
 
 QTBASE="/usr/qt/3"
 
-libdir="$(get_libdir)"
-
 pkg_setup() {
 	if use immqt && use immqt-bc ; then
 		ewarn
@@ -167,8 +165,8 @@ src_unpack() {
 		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
 		"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
 
-	if [ ${libdir} != "lib" ] ; then
-		sed -i -e "s:/lib$:/${libdir}:" \
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:/lib$:/$(get_libdir):" \
 			"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
 	fi
 
@@ -185,12 +183,12 @@ src_compile() {
 	addwrite "${QTBASE}/etc/settings"
 	addwrite "${HOME}/.qt"
 
-	[ "${libdir}" != "lib" ] && myconf="${myconf} -L/usr/${libdir}"
+	[ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
 
 	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
 	use nas		&& myconf+=" -system-nas-sound"
 	use nis		&& myconf+=" -nis" || myconf+=" -no-nis"
-	use mysql	&& myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/${libdir}/mysql" || myconf+=" -no-sql-mysql"
+	use mysql	&& myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql"
 	use postgres	&& myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql"
 	use firebird    && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase"
 	use sqlite	&& myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite"
@@ -212,7 +210,7 @@ src_compile() {
 	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
 		-system-libpng -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/${libdir} \
+		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
 		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
 
 	emake src-qmake src-moc sub-src || die
@@ -249,7 +247,7 @@ src_install() {
 	dolib.so lib/lib{editor,qassistantclient,designercore}.a
 	dolib.so lib/libqt-mt.la
 	dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0
-	cd "${D}"/${QTBASE}/${libdir}
+	cd "${D}"/${QTBASE}/$(get_libdir)
 
 	for x in libqui.so ; do
 		ln -s $x.1.0.0 $x.1.0
@@ -287,11 +285,11 @@ src_install() {
 
 	# prl files
 	sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
-	insinto ${QTBASE}/${libdir}
+	insinto ${QTBASE}/$(get_libdir)
 	doins "${S}"/lib/*.prl
 
 	# pkg-config file
-	insinto ${QTBASE}/${libdir}/pkgconfig
+	insinto ${QTBASE}/$(get_libdir)/pkgconfig
 	doins "${S}"/lib/*.pc
 
 	# List all the multilib libdirs
@@ -307,7 +305,7 @@ ROOTPATH=${QTBASE}/bin
 LDPATH=${libdirs:1}
 QMAKESPEC=${PLATFORM}
 MANPATH=${QTBASE}/doc/man
-PKG_CONFIG_PATH=${QTBASE}/${libdir}/pkgconfig
+PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig
 EOF
 
 	cat <<EOF > "${T}"/50qtdir3
diff --git a/x11-libs/qt/qt-3.3.8b-r2.ebuild b/x11-libs/qt/qt-3.3.8b-r2.ebuild
index d9de1737a49f..4eb6247ad0f9 100644
--- a/x11-libs/qt/qt-3.3.8b-r2.ebuild
+++ b/x11-libs/qt/qt-3.3.8b-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v 1.1 2009/06/11 20:46:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v 1.2 2009/08/02 21:54:28 tommy Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -51,8 +51,6 @@ S="${WORKDIR}/qt-x11-${SRCTYPE}-${PV}"
 
 QTBASE="/usr/qt/3"
 
-libdir="$(get_libdir)"
-
 pkg_setup() {
 	if use immqt && use immqt-bc ; then
 		ewarn
@@ -167,8 +165,8 @@ src_unpack() {
 		   -e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \
 		"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
 
-	if [ ${libdir} != "lib" ] ; then
-		sed -i -e "s:/lib$:/${libdir}:" \
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:/lib$:/$(get_libdir):" \
 			"${S}"/mkspecs/${PLATFORM}/qmake.conf || die
 	fi
 
@@ -185,12 +183,12 @@ src_compile() {
 	addwrite "${QTBASE}/etc/settings"
 	addwrite "${HOME}/.qt"
 
-	[ "${libdir}" != "lib" ] && myconf="${myconf} -L/usr/${libdir}"
+	[ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
 
 	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
 	use nas		&& myconf+=" -system-nas-sound"
 	use nis		&& myconf+=" -nis" || myconf+=" -no-nis"
-	use mysql	&& myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/${libdir}/mysql" || myconf+=" -no-sql-mysql"
+	use mysql	&& myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql"
 	use postgres	&& myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql"
 	use firebird    && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase"
 	use sqlite	&& myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite"
@@ -212,7 +210,7 @@ src_compile() {
 	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
 		-system-libpng -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/${libdir} \
+		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
 		-fast -no-sql-odbc ${myconf} -dlopen-opengl || die
 
 	emake src-qmake src-moc sub-src || die
@@ -249,7 +247,7 @@ src_install() {
 	dolib.so lib/lib{editor,qassistantclient,designercore}.a
 	dolib.so lib/libqt-mt.la
 	dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0
-	cd "${D}"/${QTBASE}/${libdir}
+	cd "${D}"/${QTBASE}/$(get_libdir)
 
 	for x in libqui.so ; do
 		ln -s $x.1.0.0 $x.1.0
@@ -287,7 +285,7 @@ src_install() {
 
 	# prl files
 	sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl
-	insinto ${QTBASE}/${libdir}
+	insinto ${QTBASE}/$(get_libdir)
 	doins "${S}"/lib/*.prl
 
 	# pkg-config file