sandbox violation fix and compile help fix

3 files changed, 29 insertions, 23 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7d424a03486a..7d2b8dab3b87 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.83 2003/09/12 00:09:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.84 2003/09/16 02:29:46 caleb Exp $
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.1.ebuild:
+  Fix for sandbox violation, and compile fixes...
 
   11 Sep 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.1.ebuild:
   Some fixes to make it compile and install mo betta for people
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 76d90ae7b5ff..193e7d5f543f 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,34 +1,34 @@
-MD5 f9f5c064997ef90074503306121f6a14 ChangeLog 14010
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
 MD5 3ea4b4de8bf408a89bad7560499c5517 qt-2.3.2-r1.ebuild 2274
+MD5 5d730f385b04f1f93ddfc68c58e341dc qt-3.2.1.ebuild 4935
 MD5 a3dd25c9f882f04df789dddc02ed3177 qt-3.0.5-r2.ebuild 3896
 MD5 00e9d63f2373eecbf8d070845e3ed794 qt-3.1.0-r3.ebuild 4698
-MD5 b1227e9708a51d583e96b533764e5f5c qt-3.1.1-r2.ebuild 4510
-MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
 MD5 aff33d960efe2f7ef7782bd0a7cc9441 qt-3.1.2-r4.ebuild 5340
+MD5 b1227e9708a51d583e96b533764e5f5c qt-3.1.1-r2.ebuild 4510
 MD5 c2026904ef73059c2f6e8138d2d62caa qt-3.2.0.ebuild 4339
-MD5 040568137589d260885c4916bb7b094b qt-3.2.1.ebuild 4788
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 766fc04a91801bf63cb329cbb6f166c3 ChangeLog 14125
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
-MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
-MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
+MD5 edd5c27031cc5f29070a9094425f09d9 files/digest-qt-3.2.0 72
 MD5 b79277b535797e854be75d1c396de0f2 files/digest-qt-3.2.1 72
+MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
-MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
+MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
+MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
 MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
 MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r2 72
-MD5 edd5c27031cc5f29070a9094425f09d9 files/digest-qt-3.2.0 72
+MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
+MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
+MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
 MD5 953be971128fb1a5ad7d9893f657e13c files/qt-3.1.2-korean-xim.patch 4285
-MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
-MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 8c9b47edf5949643d8dbeb3fecc40e7c files/qt-3.1.2-qfont-jp-family-subst-20030421.patch 22730
-MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
-MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
+MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
diff --git a/x11-libs/qt/qt-3.2.1.ebuild b/x11-libs/qt/qt-3.2.1.ebuild
index 8911ba749b5c..3fe26390ed26 100644
--- a/x11-libs/qt/qt-3.2.1.ebuild
+++ b/x11-libs/qt/qt-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.1.ebuild,v 1.6 2003/09/12 08:24:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.1.ebuild,v 1.7 2003/09/16 02:29:46 caleb Exp $
 
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
@@ -76,6 +76,8 @@ _EOF_
 src_compile() {
 	export QTDIR=${S}
 	export SYSCONF=${QTBASE}/etc/settings
+	LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH}
+	export LD_LIBRARY_PATH=${WORKDIR}/lib:${LD_LIBRARY_PATH}
 
 	# fix #11144; qt wants to create lock files etc. in that directory
 	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
@@ -101,10 +103,11 @@ src_compile() {
 	./configure -sm -thread -stl -system-zlib -system-libjpeg -verbose \
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
 		-system-libpng -ldl -lpthread -xft -platform linux-g++ -xplatform \
-		linux-g++ -xrender -prefix ${QTBASE} -fast ${myconf} || die
+		linux-g++ -xrender -prefix ${D}${QTBASE} -fast ${myconf} || die
 
 	export QTDIR=${S}
 	emake src-qmake src-moc sub-src sub-tools || die
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD}
 }
 
 src_install() {