removed -fPIC hackery for qt-3.1.2, added ~alpha for qt-2

4 files changed, 21 insertions, 28 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index b9ca43877a95..d410989bebe9 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,7 +1,13 @@
 # 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.69 2003/06/01 17:34:40 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.70 2003/06/10 23:53:19 wwoods Exp $
 
+  10 Jun 2003; Will Woods <wwoods@gentoo.org> qt-2.3.2-r1.ebuild:
+  Added ~alpha to KEYWORDS
+
+  10 Jun 2003; Will Woods <wwoods@gentoo.org> qt-3.1.2-r3.ebuild:
+  removed alpha -fPIC hackery which appears to be unneeded for qt-3.1.2
+	
   01 Jun 2003; Bartosch Pixa <darkspecter@gentoo.org> qt-3.1.0-r3.ebuild:
   set ppc in keywords
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 285ede58256c..67c9ef88b73a 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,23 +1,23 @@
-MD5 63f1df1aa351dc17abe7d0321b70844a qt-2.3.2-r1.ebuild 2309
+MD5 6c4a619bf908470dee618fdf2b541d37 ChangeLog 11822
+MD5 83b0501258e0ff01e8a490b930b208e5 qt-2.3.2-r1.ebuild 2316
 MD5 7574a34ccd181870ea18bf3145310e37 qt-3.0.5-r2.ebuild 3975
+MD5 7d57c6970431541c36f2b5204ef553c4 qt-3.2.0_beta1.ebuild 4489
 MD5 adbc3aba052acc4d8f783b4a281f05c1 qt-3.1.0-r3.ebuild 4844
 MD5 66b942151418494936c3b73e01e37d68 qt-3.1.1-r2.ebuild 4659
-MD5 dc79cc79c1a4e06cdc1aec923f510d47 qt-3.1.2-r3.ebuild 5458
-MD5 7d57c6970431541c36f2b5204ef553c4 qt-3.2.0_beta1.ebuild 4489
-MD5 8da12788cf6d8004a2809c350489cc5f ChangeLog 11593
+MD5 ad453a0562546a97ee88fa3c6b0f289b qt-3.1.2-r3.ebuild 5019
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
 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 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 75f50432ffd304d181e2799f7cdba228 files/digest-qt-3.2.0_beta1 74
 MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
 MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
+MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
+MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r2 72
 MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
 MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
+MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
 MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
-MD5 75f50432ffd304d181e2799f7cdba228 files/digest-qt-3.2.0_beta1 74
diff --git a/x11-libs/qt/qt-2.3.2-r1.ebuild b/x11-libs/qt/qt-2.3.2-r1.ebuild
index e5088fc6c913..a6077f27a9f1 100644
--- a/x11-libs/qt/qt-2.3.2-r1.ebuild
+++ b/x11-libs/qt/qt-2.3.2-r1.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-2.3.2-r1.ebuild,v 1.19 2003/04/27 14:14:17 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-2.3.2-r1.ebuild,v 1.20 2003/06/10 23:53:19 wwoods Exp $
 
 IUSE="gif opengl nas"
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${PV}.tar.gz"
 HOMEPAGE="http://www.trolltech.com/"
 SLOT="2"
 LICENSE="QPL-1.0"
-KEYWORDS="x86 ppc sparc hppa"
+KEYWORDS="x86 ppc sparc hppa ~alpha"
 
 RDEPEND="virtual/x11
 	media-libs/libpng
diff --git a/x11-libs/qt/qt-3.1.2-r3.ebuild b/x11-libs/qt/qt-3.1.2-r3.ebuild
index e0975dc60911..b462bfdbe9cd 100644
--- a/x11-libs/qt/qt-3.1.2-r3.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r3.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.1.2-r3.ebuild,v 1.3 2003/05/22 02:08:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.4 2003/06/10 23:53:19 wwoods Exp $
 
 inherit eutils
 
@@ -13,8 +13,7 @@ SLOT="3"
 LICENSE="QPL-1.0"
 
 # WARNING: do not give this ebuild keywords that >=kdelibs-3.1.1, >=kdebase-3.1.1-r1 don't have
-KEYWORDS="x86 ~ppc sparc" # alpha removed temporarily as I wasn't sure about the special
-			    # alpha stuff in src_unpack; alpha ppl please readd. --danarmak
+KEYWORDS="x86 ~ppc sparc ~alpha"
 
 SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
 
@@ -75,7 +74,7 @@ src_unpack() {
 	    sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
 	fi
 	
-	# hppa and alpha people, please review the following
+	# hppa people, please review the following
 	
 	# hppa need some additional flags
 	if [ "${ARCH}" = "hppa" ]; then
@@ -83,18 +82,6 @@ src_unpack() {
 		echo "QMAKE_CXXFLAGS += -fPIC -ffunction-sections" >> qmake.conf
 		echo "QMAKE_LFLAGS += -ffunction-sections -Wl,--stub-group-size=25000" >> qmake.conf
 	fi
-	
-	# on alpha we need to compile everything with -fPIC
-	if [ ${ARCH} == "alpha" ]; then
-	    cp qmake.conf qmake.conf.orig
-	    sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf
-	    cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_
-QMAKE_CFLAGS += -fPIC
-QMAKE_CXXFLAGS += -fPIC
-_EOF_
-	fi
-
-
 }
 
 src_compile() {