Add -sysconfdir to the configure; Move SYSCONF into ${D} to potentially stop emerge errors

4 files changed, 15 insertions, 10 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7fec4acc2251..38f852e38715 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.101 2003/12/30 22:48:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.102 2004/01/04 02:45:06 caleb Exp $
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> qt-3.2.3.ebuild,
+  qt-3.3.0_beta1.ebuild:
+  Add -sysconfdir to the configure
+  Move SYSCONF to ${D} so there should be no more errors during emerge
 
   28 Dec 2003; Caleb Tennis <caleb@gentoo.org> qt-3.3.0_beta1.ebuild:
   Make qt-cvs and qt-3.3 look the same
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 3da602c8123d..0d43ccf7b2b2 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -3,10 +3,10 @@ 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 c9e30c0f1ad7510945502fb69c9dff02 qt-3.2.3.ebuild 5098
-MD5 9a438f6a08f0c2f38856d2e90e234ce8 qt-3.3.0_beta1.ebuild 4869
+MD5 34d7e86effe978ec96eae9a33ecfe2f6 qt-3.2.3.ebuild 5136
+MD5 77cdc767f390eff15955797434a97a37 qt-3.3.0_beta1.ebuild 4908
 MD5 aff33d960efe2f7ef7782bd0a7cc9441 qt-3.1.2-r4.ebuild 5340
-MD5 cedb40e0d95c89ca636437e8b8e6565f ChangeLog 16679
+MD5 5ff3dd3b8a687ac52974dca9fdb26e2f ChangeLog 16874
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 f036a81a9440e146ca67fb23dbb2b535 files/0013-qtabwidget-less_flicker.patch 2785
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
diff --git a/x11-libs/qt/qt-3.2.3.ebuild b/x11-libs/qt/qt-3.2.3.ebuild
index 2c8e96daa2b6..e6d085ea90cd 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.6 2003/12/30 22:48:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3.ebuild,v 1.7 2004/01/04 02:45:06 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -75,7 +75,7 @@ _EOF_
 
 src_compile() {
 	export QTDIR=${S}
-	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}
 
@@ -102,7 +102,7 @@ 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
+		-datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} || die
 
 	export QTDIR=${S}
 	emake src-qmake src-moc sub-src sub-tools || die
diff --git a/x11-libs/qt/qt-3.3.0_beta1.ebuild b/x11-libs/qt/qt-3.3.0_beta1.ebuild
index d00d4807b6e2..16b3e879efe3 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.5 2004/01/04 01:37:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0_beta1.ebuild,v 1.6 2004/01/04 02:45:06 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -55,7 +55,7 @@ src_unpack() {
 
 src_compile() {
 	export QTDIR=${S}
-	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}
 
@@ -85,7 +85,7 @@ src_compile() {
 		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
 		${PLATFORM} -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \
 		-docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \
-		-datadir ${QTBASE} -fast ${myconf} -dlopen-opengl || die
+		-datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} -dlopen-opengl || die
 
 	export QTDIR=${S}
 	emake src-qmake src-moc sub-src sub-tools || die