New version, including my handy-dandy uic build fix to make sure uic links against the proper Qt version

7 files changed, 46 insertions, 40 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index dd07288c50f0..2f72262f0e87 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.129 2004/03/01 00:32:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.130 2004/03/01 13:01:48 caleb Exp $
+
+*qt-3.3.1 (01 Mar 2004)
+
+  01 Mar 2004; Caleb Tennis <caleb@gentoo.org> qt-3.3.0-r1.ebuild,
+  qt-3.3.1.ebuild:
+  New version.  We now patch the build of uic so that it isn't
+  rpathed hardcoded against /usr/qt/3/lib/libqt.so, but can be told to
+  link against the Qt that is currently building.
 
   29 Feb 2004; Caleb Tennis <caleb@gentoo.org> qt-3.2.3-r1.ebuild:
   Typo fix and add xinerama flag
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 235eabb412ce..f2c597029b1c 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,16 +1,16 @@
-MD5 a96aabdc5fbccb1e62d48e3462a6bcb1 qt-3.3.0-r1.ebuild 4977
-MD5 c9c496912fe8e4b25bd5cf84645accdf qt-3.3.0.ebuild 5291
+MD5 4c52c470dbcf7ed6110bb468b8783782 qt-3.3.0-r1.ebuild 5006
 MD5 9e84006a240b69c02e0aa8b957d48662 qt-3.1.2-r3.ebuild 4984
 MD5 15cb67cf0a0a71f8c86c4aa91714360c qt-2.3.2-r1.ebuild 2285
 MD5 913367613ee452605a107179d5fa1c76 qt-3.0.5-r2.ebuild 3907
+MD5 5a069a91d4b9b2d201a54e5ed81a602e qt-3.3.1.ebuild 4653
 MD5 8ba2f35348af78eaa4cf70cdfef1ba01 qt-3.1.2-r4.ebuild 5347
-MD5 1dd04f26f089cf13678cf72e7d1f2ccd ChangeLog 22327
+MD5 bb006a916c7dd84d2001dac694f50ddd ChangeLog 22623
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 d907d7db29c7ee85e7dd567ea289d732 qt-3.2.3-r1.ebuild 5105
 MD5 9ac22fe721162a565a7507763f785ab5 files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch 9972
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 c585d6ad02168e4645ea5ca46d237e1c files/digest-qt-3.3.0 72
+MD5 87c645dbad7233316ff3340847a59f22 files/digest-qt-3.3.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 b87df8ba9bf813ffe5e280fa2d79da25 files/qt-3.1.2-qpsprinter-ttc-otf-italic-20030429.patch 19286
@@ -31,5 +31,6 @@ MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 1268
 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 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
 MD5 057679471a1149cfba2cabd7a1fd2b55 files/qt-3.2.3-qfontdatabase-i18n-20031024.patch 10536
 MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
diff --git a/x11-libs/qt/files/digest-qt-3.3.0 b/x11-libs/qt/files/digest-qt-3.3.0
deleted file mode 100644
index b19f8ee750bc..000000000000
--- a/x11-libs/qt/files/digest-qt-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c628647126bb7bd957417f530ab04d4 qt-x11-free-3.3.0.tar.bz2 14401807
diff --git a/x11-libs/qt/files/digest-qt-3.3.1 b/x11-libs/qt/files/digest-qt-3.3.1
new file mode 100644
index 000000000000..68146f1a0e7f
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.1
@@ -0,0 +1 @@
+MD5 4e599bedfcb3fe389bc7ec921c476432 qt-x11-free-3.3.1.tar.bz2 14397600
diff --git a/x11-libs/qt/files/qt-no-rpath-uic.patch b/x11-libs/qt/files/qt-no-rpath-uic.patch
new file mode 100644
index 000000000000..dd6ab67ac7cb
--- /dev/null
+++ b/x11-libs/qt/files/qt-no-rpath-uic.patch
@@ -0,0 +1,10 @@
+--- tools/designer/uic/uic.pro.orig	2004-02-20 11:08:12.000000000 -0500
++++ tools/designer/uic/uic.pro	2004-02-20 11:08:27.000000000 -0500
+@@ -25,6 +25,7 @@
+ INCLUDEPATH	+= ../shared
+ DEFINES 	+= UIC
+ DESTDIR		= ../../../bin
++QMAKE_RPATH	=
+ 
+ target.path=$$bins.path
+ INSTALLS        += target
diff --git a/x11-libs/qt/qt-3.3.0-r1.ebuild b/x11-libs/qt/qt-3.3.0-r1.ebuild
index ce7a8910a67a..3ad33e2159cf 100644
--- a/x11-libs/qt/qt-3.3.0-r1.ebuild
+++ b/x11-libs/qt/qt-3.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.4 2004/02/29 21:43:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.0-r1.ebuild,v 1.5 2004/03/01 13:01:49 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -44,6 +44,8 @@ src_unpack() {
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
 
+	epatch ${FILESDIR}/qt-no-rpath-uic.patch
+
 	export PLATFORM=linux-g++
 #	use icc && export PLATFORM=linux-icc
 }
@@ -83,8 +85,7 @@ src_compile() {
 	export QTDIR=${S}
 
 	emake src-qmake src-moc sub-src || die
-	export LD_PRELOAD="${LD_PRELOAD} ${QTDIR}/lib/libqt-mt.so"
-	emake sub-tools || die
+	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
 }
 
 src_install() {
diff --git a/x11-libs/qt/qt-3.3.0.ebuild b/x11-libs/qt/qt-3.3.1.ebuild
index 9915e0c27959..dd956b094850 100644
--- a/x11-libs/qt/qt-3.3.0.ebuild
+++ b/x11-libs/qt/qt-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.17 2004/02/14 15:44:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.1.ebuild,v 1.1 2004/03/01 13:01:49 caleb Exp $
 
 SRCTYPE="free"
 DESCRIPTION="QT version ${PV}"
@@ -10,8 +10,8 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 
 LICENSE="QPL-1.0 | GPL-2"
 SLOT="3"
-KEYWORDS="x86 ~alpha ~ppc ~amd64"
-IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite ipv6"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64"
+IUSE="cups nas postgres opengl mysql odbc gif doc firebird zlib icc sqlite ipv6 xinerama"
 
 DEPEND="virtual/x11 virtual/xft
 	media-libs/libpng media-libs/jpeg media-libs/libmng
@@ -31,10 +31,10 @@ DEPEND="virtual/x11 virtual/xft
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
-LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH}
 
 QTBASE=/usr/qt/3
 export QTDIR=${S}
+export PLATFORM=linux-g++
 
 src_unpack() {
 	unpack ${A}
@@ -45,15 +45,14 @@ src_unpack() {
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
 
-	export PLATFORM=linux-g++
-	use icc && export PLATFORM=linux-icc
+	epatch ${FILESDIR}/qt-no-rpath-uic.patch
+
+#	use icc && export PLATFORM=linux-icc
 }
 
 src_compile() {
 	export QTDIR=${S}
 	export SYSCONF=${D}${QTBASE}/etc/settings
-	LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH}
-	export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH}
 
 	# Let's just allow writing to these directories during Qt emerge
 	# as it makes Qt much happier.
@@ -71,7 +70,7 @@ src_compile() {
 	use cups	&& myconf="${myconf} -cups" || myconf="${myconf} -no-cups"
 	use opengl	&& myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl"
 	use debug	&& myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions"
-	use xinerama    && myconf="${myconf} -xinerama"
+	use xinerama    && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama"
 	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
 	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
 
@@ -80,16 +79,13 @@ src_compile() {
 	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
 		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
 		-system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \
-		${PLATFORM} -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \
-		-docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \
-		-datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} \
-		-libdir ${QTBASE}/lib -headerdir ${QTBASE}/include \
-		-bindir ${QTBASE}/bin -dlopen-opengl || die
+		${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \
+		-dlopen-opengl || die
 
 	export QTDIR=${S}
-	emake src-qmake src-moc sub-src sub-tools || die
-	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD}
-	export HOME="$REALHOME"
+
+	emake src-qmake src-moc sub-src || die
+	LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die
 }
 
 src_install() {
@@ -101,7 +97,7 @@ src_install() {
 
 	# libraries
 
-	dolib lib/libqt-mt.so.3.3.0 lib/libqui.so.1.0.0
+	dolib lib/libqt-mt.so.3.3.1 lib/libqui.so.1.0.0
 	dolib lib/lib{editor,qassistantclient,designercore}.a lib/libqt-mt.la
 
 	cd ${D}/$QTBASE/lib
@@ -111,13 +107,13 @@ src_install() {
 		ln -s $x.1 $x
 	done
 
-	# version symlinks - 3.3.0->3.3->3->.so
-	ln -s libqt-mt.so.3.3.0 libqt-mt.so.3.3
+	# version symlinks - 3.3.1->3.3->3->.so
+	ln -s libqt-mt.so.3.3.1 libqt-mt.so.3.3
 	ln -s libqt-mt.so.3.3 libqt-mt.so.3
 	ln -s libqt-mt.so.3 libqt-mt.so
 
 	# libqt -> libqt-mt symlinks
-	ln -s libqt-mt.so.3.3.0 libqt.so.3.3.0
+	ln -s libqt-mt.so.3.3.1 libqt.so.3.3.1
 	ln -s libqt-mt.so.3.3 libqt.so.3.3
 	ln -s libqt-mt.so.3 libqt.so.3
 	ln -s libqt-mt.so libqt.so
@@ -166,13 +162,3 @@ src_install() {
 		doins $x
 	done
 }
-
-pkg_postinst()
-{
-	einfo
-	einfo "If you are upgrading Qt from an earlier version, it's possible that"
-	einfo "your buildkey has changed (based on use flags).  This causes problems"
-	einfo "loading KDE plugins.  If you have problems with KDE styles, the"
-	einfo "simple solution is to re-emerge kdelibs (and kdeartwork if you have it)."
-	einfo
-}