fix some path handling - do a rev bump as it fixes some bugs

4 files changed, 211 insertions, 4 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 2a203dbbb836..e2723b6e6fac 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.87 2003/10/01 13:08:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.88 2003/10/02 20:29:45 caleb Exp $
+
+*qt-3.2.1-r2 (02 Oct 2003)
+
+  02 Oct 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.1-r2.ebuild:
+  Fix the ebuild to make some pathway stuff a bit happier.
 
   01 Oct 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.1-r1.ebuild:
   Add -plugindir ${QTBASE}/plugins to configure line to alleviate some
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 386ed76317cb..672ec8c744c9 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,14 +1,14 @@
-MD5 c9e4310181f4439678973b037ba4e009 qt-3.2.1-r2.ebuild 6088
+MD5 523c4c13e85c18404fe462e42d67f196 qt-3.2.1-r2.ebuild 6101
 MD5 232c9a440f58d6f1a15c750ba4a25c48 qt-3.1.2-r3.ebuild 4979
 MD5 3ea4b4de8bf408a89bad7560499c5517 qt-2.3.2-r1.ebuild 2274
 MD5 c47d4bd47ef74b87a7eaa1c5969ec48e qt-3.2.1.ebuild 4937
-MD5 5423c7fd2399d3fde3905d1c13fe4e4b qt-3.2.1-r1.ebuild 6039
+MD5 651404c4830d5a1094cd9b8bad46d7de qt-3.2.1-r1.ebuild 5857
 MD5 a3dd25c9f882f04df789dddc02ed3177 qt-3.0.5-r2.ebuild 3896
 MD5 00e9d63f2373eecbf8d070845e3ed794 qt-3.1.0-r3.ebuild 4698
 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 b9a193c2314c4f4d01ce6f80d49135bb ChangeLog 14593
+MD5 ba79db3f357f5a00cf2aad891dd760df ChangeLog 14748
 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/files/digest-qt-3.2.1-r2 b/x11-libs/qt/files/digest-qt-3.2.1-r2
new file mode 100644
index 000000000000..bdba907c9968
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.2.1-r2
@@ -0,0 +1 @@
+MD5 9ae022ffe7603ec34aba150f6cca257a qt-x11-free-3.2.1.tar.bz2 13981279
diff --git a/x11-libs/qt/qt-3.2.1-r2.ebuild b/x11-libs/qt/qt-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..a30d66b3ff74
--- /dev/null
+++ b/x11-libs/qt/qt-3.2.1-r2.ebuild
@@ -0,0 +1,201 @@
+# 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-r2.ebuild,v 1.1 2003/10/02 20:29:45 caleb Exp $
+
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
+
+LICENSE="QPL-1.0 | GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~ppc"
+IUSE="cups nas postgres opengl mysql odbc gif doc"
+
+DEPEND="virtual/x11
+	media-libs/libpng
+	media-libs/lcms
+	media-libs/jpeg
+	>=media-libs/libmng-1.0.0
+	>=media-libs/freetype-2
+	virtual/xft
+	!<kde-base/kdelibs-3.1.4
+	nas? ( >=media-libs/nas-1.4.1 )
+	odbc? ( >=dev-db/unixODBC-2.0 )
+	mysql? ( >=dev-db/mysql-3.2.10 )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( >=dev-db/postgresql-7.2 )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/qt-x11-free-${PV}
+
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+
+src_unpack() {
+	unpack ${A}
+
+	export QTDIR=${S}
+	cd ${S}
+
+	cp configure configure.orig
+	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
+
+	cd mkspecs/linux-g++
+	# use env's $CC, $CXX
+	if [ -n "$CXX" ]; then
+		einfo 'Using environment definition of $CXX'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf
+	fi
+	if [ -n "$CC" ]; then
+		einfo 'Using environment definition of $CC'
+		cp qmake.conf qmake.conf.orig
+		sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf
+	fi
+
+	# hppa and alpha people, please review the following
+
+	# hppa need some additional flags
+	if [ "${ARCH}" = "hppa" ]; then
+		echo "QMAKE_CFLAGS += -fPIC -ffunction-sections" >> qmake.conf
+		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
+
+	cd ${S}
+	epatch ${FILESDIR}/0001-dnd_optimization.patch
+	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
+	epatch ${FILESDIR}/0003-qmenubar_fitts_law.patch
+	epatch ${FILESDIR}/0004-qiconview_etc_ctrl_selecting.patch
+	epatch ${FILESDIR}/0009-window_group.patch
+	epatch ${FILESDIR}/0011-listview_keys.patch
+	epatch ${FILESDIR}/0013-qtabwidget-less_flicker.patch
+	epatch ${FILESDIR}/0014-qiconview-autoscroll.patch
+	epatch ${FILESDIR}/0015-qiconview-finditem.patch
+	epatch ${FILESDIR}/0016-qiconview-rebuildcontainer.patch
+	epatch ${FILESDIR}/0017-qiconview-ctrl_rubber.patch
+	epatch ${FILESDIR}/0018-qlistview-paintcell.patch
+	epatch ${FILESDIR}/0019-qlistview-adjustcolumn.patch
+	epatch ${FILESDIR}/0020-designer-deletetabs.patch
+	epatch ${FILESDIR}/0021-qiconview-dragalittle.patch
+	epatch ${FILESDIR}/0022-qdragobject-hotspot.patch
+	epatch ${FILESDIR}/0024-fix_enter_leave_notify.patch
+}
+
+src_compile() {
+	export QTDIR=${S}
+	export SYSCONF=${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
+
+	export LDFLAGS="-ldl"
+
+	use cups	|| myconf="${myconf} -no-cups"
+	use nas		&& myconf="${myconf} -system-nas-sound"
+	use gif		&& myconf="${myconf} -qt-gif"
+	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"
+	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server"
+	use odbc	&& myconf="${myconf} -plugin-sql-odbc"
+	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"
+
+	export YACC='byacc -d'
+
+	./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 ${D}${QTBASE} -plugindir ${QTBASE}/plugins \
+		-docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \
+		-datadir ${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() {
+	export QTDIR=${S}
+
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# libraries
+	dolib lib/libqt-mt.so.3.2.1 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designercore}.a
+	cd ${D}/$QTBASE/lib
+	for x in libqui.so ; do
+		ln -s $x.1.0.0 $x.1.0
+		ln -s $x.1.0 $x.1
+		ln -s $x.1 $x
+	done
+
+	# version symlinks - 3.2.1->3.2->3->.so
+	ln -s libqt-mt.so.3.2.1 libqt-mt.so.3.2
+	ln -s libqt-mt.so.3.2 libqt-mt.so.3
+	ln -s libqt-mt.so.3 libqt-mt.so
+
+	# libqt -> libqt-mt symlinks
+	ln -s libqt-mt.so.3.2.1 libqt.so.3.2.1
+	ln -s libqt-mt.so.3.2 libqt.so.3.2
+	ln -s libqt-mt.so.3 libqt.so.3
+	ln -s libqt-mt.so libqt.so
+
+	# includes
+	cd ${S}
+	dodir ${QTBASE}/include/private
+	cp include/* ${D}/${QTBASE}/include/
+	cp include/private/* ${D}/${QTBASE}/include/private/
+
+	# misc
+	insinto /etc/env.d
+	doins ${FILESDIR}/{45qt3,50qtdir3}
+
+	dodir ${QTBASE}/tools/designer/templates
+	cd ${S}
+	cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates
+
+	dodir ${QTBASE}/translations
+	cd ${S}
+	cp translations/* ${D}/${QTBASE}/translations
+
+	dodir ${QTBASE}/doc
+
+	if [ `use doc` ]; then
+		dodir ${QTBASE}/doc/html
+		dodir ${QTBASE}/doc/man
+		cp -r ${S}/doc/html/* ${D}/${QTBASE}/doc/html
+		cp -r ${S}/doc/man/* ${D}/${QTBASE}/doc/man
+		cp -r ${S}/examples ${D}/${QTBASE}
+		cp -r ${S}/tutorial ${D}/${QTBASE}
+	fi
+
+	# misc build reqs
+	dodir ${QTBASE}/mkspecs
+	cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/
+
+	sed -e "s:${S}:${QTBASE}:g" \
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+
+	# plugins
+	cd ${S}
+	plugins=`find plugins -name "lib*.so" -print`
+	for x in $plugins; do
+		insinto ${QTBASE}/`dirname $x`
+		doins $x
+	done
+}