readd last fixes, plus some code to make the sandbox writes happier

4 files changed, 61 insertions, 67 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index eeb8e282e049..7051d42224a7 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2004/01/05 00:19:56 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.105 2004/01/05 02:57:25 caleb Exp $
+
+  04 Jan 2004; Caleb Tennis <caleb@gentoo.org> qt-3.2.3.ebuild,
+  qt-3.3.0_beta1.ebuild:
+  Readd sysconfdir settings, make and allow writes to /etc/settings to make the
+  sandbox happier
 
   04 Jan 2004; Brad House <brad_mssw@gentoo.org> qt-3.2.3.ebuild:
   last commit cause _major_ access violations during emerge.  Reverting
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 45e579903dfd..f1f272f9b0aa 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,60 +1,60 @@
-MD5 a75c5403dd488c331756f6f75751584a ChangeLog 17171
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
+MD5 9de36830c26a229b68dee7cf3442f287 qt-3.2.2-r1.ebuild 6277
 MD5 8d694ee5132993e415b040eff6ad298e qt-2.3.2-r1.ebuild 2277
+MD5 c47d4bd47ef74b87a7eaa1c5969ec48e qt-3.2.1.ebuild 4937
 MD5 a3dd25c9f882f04df789dddc02ed3177 qt-3.0.5-r2.ebuild 3896
-MD5 9de36830c26a229b68dee7cf3442f287 qt-3.2.2-r1.ebuild 6277
-MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
+MD5 8dd81171d31a0e0338d723c778e48ffb qt-3.2.3.ebuild 5094
+MD5 175d54252994c155440edef9bd020ec9 qt-3.3.0_beta1.ebuild 5128
 MD5 aff33d960efe2f7ef7782bd0a7cc9441 qt-3.1.2-r4.ebuild 5340
-MD5 aba7a444bf2b6e7c6e44fcd822ee7099 qt-3.2.3.ebuild 5529
-MD5 c0f22535c64744196d2c5af0a442b4be qt-3.3.0_beta1.ebuild 5241
-MD5 c47d4bd47ef74b87a7eaa1c5969ec48e qt-3.2.1.ebuild 4937
+MD5 21900e9dac22d298981c8a39a2e90a91 ChangeLog 17355
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 f036a81a9440e146ca67fb23dbb2b535 files/0013-qtabwidget-less_flicker.patch 2785
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 5716cdfbdcb04ba8e3a25c7e1c49a9cc files/0026-netwm-fullscreen.patch 8243
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
-MD5 cb961de2c2123caa01b045da33a3da21 files/0003-qmenubar_fitts_law.patch 979
+MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
+MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
 MD5 65c6cd464a60955c85a85b1dfd487c04 files/0004-qiconview_etc_ctrl_selecting.patch 2207
-MD5 ac9d015b2aca3f99a110d486b5232fad files/0009-window_group.patch 4156
-MD5 3b9e1d14819114b64b8bf770e1a474cd files/0011-listview_keys.patch 2520
-MD5 f036a81a9440e146ca67fb23dbb2b535 files/0013-qtabwidget-less_flicker.patch 2785
-MD5 5469328b9b6197e8bbfbe3e1528e61ca files/0014-qiconview-autoscroll.patch 1915
-MD5 1629e8691d2921d8651788fc0499379e files/0015-qiconview-finditem.patch 1496
-MD5 2ba63844ecf426956135397f5eb845b4 files/0016-qiconview-rebuildcontainer.patch 1211
-MD5 91372ac45b85140af55a26498293e4ff files/0017-qiconview-ctrl_rubber.patch 3443
-MD5 cf7fad8d582c6b517b3555aba4e26fd1 files/0018-qlistview-paintcell.patch 1442
-MD5 3caa2fcd52c019652d8f73cd957ad85c files/0019-qlistview-adjustcolumn.patch 1508
+MD5 b79277b535797e854be75d1c396de0f2 files/digest-qt-3.2.1 72
+MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3 72
+MD5 8fd2bb8fe0c4752252d064ff62257f9a files/0028-fix_sub_popup_crash.patch 302
 MD5 e4054a5914b182318d548c53beea9590 files/0020-designer-deletetabs.patch 3493
-MD5 1a268563c150260e99ed24dd4d2f5fd0 files/0021-qiconview-dragalittle.patch 2341
-MD5 08fa63b47b7a7cf4886c151e1ce0e33f files/0022-qdragobject-hotspot.patch 1266
-MD5 f203b47b8d1425047e0e301cb7d68eed files/0023-qstring-crash.patch 950
+MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 0c06df8bd83ccf54e9045ef5703a1703 files/0024-fix_enter_leave_notify.patch 1374
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
-MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
+MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
+MD5 08fa63b47b7a7cf4886c151e1ce0e33f files/0022-qdragobject-hotspot.patch 1266
+MD5 905e62743eb9d6304dc70510c5d3ee69 files/0027-dnd-leak.patch 345
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
 MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
-MD5 1fd4137cd6f3d062dfd25523ee18468d files/digest-qt-3.2.2-r1 72
-MD5 24486c56d654be71e66b7c01b143c9a9 files/digest-qt-3.2.3 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
-MD5 b79277b535797e854be75d1c396de0f2 files/digest-qt-3.2.1 72
-MD5 e6052859850285f5334e722a73b2645b files/qt-3.2.2-crash-fix.patch 1035
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
-MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
+MD5 1fd4137cd6f3d062dfd25523ee18468d files/digest-qt-3.2.2-r1 72
+MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
+MD5 1a268563c150260e99ed24dd4d2f5fd0 files/0021-qiconview-dragalittle.patch 2341
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 1629e8691d2921d8651788fc0499379e files/0015-qiconview-finditem.patch 1496
+MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 cb961de2c2123caa01b045da33a3da21 files/0003-qmenubar_fitts_law.patch 979
+MD5 f203b47b8d1425047e0e301cb7d68eed files/0023-qstring-crash.patch 950
+MD5 ac9d015b2aca3f99a110d486b5232fad files/0009-window_group.patch 4156
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 2ba63844ecf426956135397f5eb845b4 files/0016-qiconview-rebuildcontainer.patch 1211
+MD5 91372ac45b85140af55a26498293e4ff files/0017-qiconview-ctrl_rubber.patch 3443
+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 3caa2fcd52c019652d8f73cd957ad85c files/0019-qlistview-adjustcolumn.patch 1508
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 3b9e1d14819114b64b8bf770e1a474cd files/0011-listview_keys.patch 2520
+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 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
-MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
-MD5 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
-MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
-MD5 024632ca815ede1ccdd13cacea10e64a files/qt-3.1.2-thai-complextext.patch 528
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 5716cdfbdcb04ba8e3a25c7e1c49a9cc files/0026-netwm-fullscreen.patch 8243
-MD5 905e62743eb9d6304dc70510c5d3ee69 files/0027-dnd-leak.patch 345
-MD5 8fd2bb8fe0c4752252d064ff62257f9a files/0028-fix_sub_popup_crash.patch 302
 MD5 911441657af4920cc73a05abdd04d2a8 files/digest-qt-3.3.0_beta1 74
-MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
-MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
-MD5 687ac003fc61501eda26cb2cf068cb2a files/qt-3.2.3-scriptForChar-20031128.patch 18095
+MD5 e6052859850285f5334e722a73b2645b files/qt-3.2.2-crash-fix.patch 1035
 MD5 f7c2e87383c3888af1404e8024815acb files/qt-3.3.0_beta1-freetype.patch 748
+MD5 cf7fad8d582c6b517b3555aba4e26fd1 files/0018-qlistview-paintcell.patch 1442
+MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
+MD5 5469328b9b6197e8bbfbe3e1528e61ca files/0014-qiconview-autoscroll.patch 1915
diff --git a/x11-libs/qt/qt-3.2.3.ebuild b/x11-libs/qt/qt-3.2.3.ebuild
index 7a39c430428f..46a60b51b753 100644
--- a/x11-libs/qt/qt-3.2.3.ebuild
+++ b/x11-libs/qt/qt-3.2.3.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.3.ebuild,v 1.8 2004/01/05 00:19:56 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3.ebuild,v 1.9 2004/01/05 02:57:25 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -75,19 +75,15 @@ _EOF_
 
 src_compile() {
 	export QTDIR=${S}
-# This line was part of the patch that caused the
-# access violations, removing it, and reverting to
-# the old one
-# Brad House <brad_mssw@gentoo.org> 1/4/2004
-#	export SYSCONF=${D}${QTBASE}/etc/settings
-	export SYSCONF=${QTBASE}/etc/settings
+	export SYSCONF=${D}${QTBASE}/etc/settings
 	LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH}
 	export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH}
 
 	# fix #11144; qt wants to create lock files etc. in that directory
-	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
-	[ ! -d "$QTBASE/etc/settings" ] && dodir ${QTBASE}/etc/settings
-
+	addwrite "${QTBASE}/etc/settings"
+	addwrite "$HOME/.qt"
+	dodir ${QTBASE}/etc/settings
+	
 	export LDFLAGS="-ldl"
 
 	use cups	|| myconf="${myconf} -no-cups"
@@ -107,11 +103,8 @@ src_compile() {
 		-system-libpng -ldl -lpthread -xft -platform linux-g++ -xplatform \
 		linux-g++ -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \
 		-docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \
-		-datadir ${QTBASE} -fast ${myconf} || die
-# This line was part of the additions that caused major access
-# violations.  Reverting to old one.
-# Brad House <brad_mssw@gentoo.org> 1/4/2004
-#		-datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} || die
+		-datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} || die
+	
 	export QTDIR=${S}
 	emake src-qmake src-moc sub-src sub-tools || die
 	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD}
diff --git a/x11-libs/qt/qt-3.3.0_beta1.ebuild b/x11-libs/qt/qt-3.3.0_beta1.ebuild
index 354fd3b74d34..e90723a847a3 100644
--- a/x11-libs/qt/qt-3.3.0_beta1.ebuild
+++ b/x11-libs/qt/qt-3.3.0_beta1.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.3.0_beta1.ebuild,v 1.10 2004/01/04 17:40:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0_beta1.ebuild,v 1.11 2004/01/05 02:57:25 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -59,19 +59,15 @@ src_compile() {
 	LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH}
 	export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH}
 
-	# REALHOME="$HOME"
-	# mkdir -p $T/fakehome/.qt
-	# export HOME="$T/fakehome"
-	# [ -d "$REALHOME/.ccache" ] && ln -sf "$REALHOME/.ccache" "$HOME/"
-
 	# fix #11144; qt wants to create lock files etc. in that directory
 	# [ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
 	# [ ! -d "$QTBASE/etc/settings" ] && dodir ${QTBASE}/etc/settings
 
 	# Let's just allow writing to these directories during Qt emerge
 	# as it makes Qt much happier.
-	addwrite "$QTBASE/etc/settings"
+	addwrite "${QTBASE}/etc/settings"
 	addwrite "$HOME/.qt"
+	dodir "${QTBASE}/etc/settings"
 
 	use nas		&& myconf="${myconf} -system-nas-sound"
 	use gif		&& myconf="${myconf} -qt-gif"