Fix bug #24171

5 files changed, 206 insertions, 2 deletions

diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index de097f20c111..4e017d016ddb 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,10 +1,11 @@
-MD5 aa76eeee012698f30d50ff5044cc5487 ChangeLog 12208
+MD5 35170c97996291a8201bb4b1aefa1405 ChangeLog 12365
 MD5 0a5904be76bb25b35a03f3a5502aec90 qt-2.3.2-r1.ebuild 2323
-MD5 22916b80800bb7cb4aa58caf9fa65f7d qt-3.1.2-r4.ebuild 5073
+MD5 703ba8038e5b2979c00d10ffffb3313d qt-3.1.2-r4.ebuild 5072
 MD5 c0200496fd1c371b27238e33e95fbe9e qt-3.0.5-r2.ebuild 3983
 MD5 c31bb1b07af43f08f17f8c9ad1470cce qt-3.2.0_beta1.ebuild 4497
 MD5 d8f9c7d8ddb12f1a412670d497215015 qt-3.2.0_beta2.ebuild 4497
 MD5 774f04a75d56c8b4da7772786d16b843 qt-3.1.0-r3.ebuild 4846
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 3666aed2bc53e3d5cedf5fc6e424ed50 qt-3.1.1-r2.ebuild 4666
 MD5 73372d14af2898b8b3aec048be01a242 qt-3.1.2-r3.ebuild 5026
 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
diff --git a/x11-libs/qt/files/digest-qt-3.1.2-r4 b/x11-libs/qt/files/digest-qt-3.1.2-r4
new file mode 100644
index 000000000000..adcf5a71e37e
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.1.2-r4
@@ -0,0 +1 @@
+MD5 156591717687799c69cf3f8b64a898f2 qt-x11-free-3.1.2.tar.bz2 13358932
diff --git a/x11-libs/qt/files/qt-3.1.2-qlistview-dnd.diff b/x11-libs/qt/files/qt-3.1.2-qlistview-dnd.diff
new file mode 100644
index 000000000000..8f19b6ffe6fb
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.1.2-qlistview-dnd.diff
@@ -0,0 +1,11 @@
+--- src/widgets/qlistview.cpp	2003-02-24 19:30:39.000000000 +1100
++++ src/widgets/qlistview.cpp	2003-07-09 23:11:05.000000000 +1000
+@@ -4166,7 +4166,7 @@
+ 	else if ( selectionMode() == Extended ) {
+ 	    bool changed = FALSE;
+ 	    if ( !(e->state() & (ControlButton | ShiftButton)) ) {
+-		if ( !i->isSelected() || e->button() != RightButton ) {
++		if ( !i->isSelected() ) {
+ 		    bool blocked = signalsBlocked();
+ 		    blockSignals( TRUE );
+ 		    clearSelection();
diff --git a/x11-libs/qt/metadata.xml b/x11-libs/qt/metadata.xml
new file mode 100644
index 000000000000..01a5c2875e0d
--- /dev/null
+++ b/x11-libs/qt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd> 
+</pkgmetadata>
diff --git a/x11-libs/qt/qt-3.1.2-r4.ebuild b/x11-libs/qt/qt-3.1.2-r4.ebuild
new file mode 100644
index 000000000000..22b2a5d8a67e
--- /dev/null
+++ b/x11-libs/qt/qt-3.1.2-r4.ebuild
@@ -0,0 +1,186 @@
+# 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-r4.ebuild,v 1.1 2003/07/11 09:19:09 brain Exp $
+
+inherit eutils
+
+IUSE="cups nas postgres opengl mysql odbc gif"
+
+S=${WORKDIR}/qt-x11-free-${PV}
+
+DESCRIPTION="QT version ${PV}"
+SLOT="3"
+LICENSE="QPL-1.0 | GPL-2"
+
+# 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"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2"
+
+HOMEPAGE="http://www.trolltech.com/"
+
+DEPEND="virtual/x11
+	media-libs/libpng
+	media-libs/lcms
+	media-libs/jpeg
+	>=media-libs/libmng-1.0.0
+	>=media-libs/freetype-2
+	virtual/xft
+	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 )
+	!=kde-base/kdelibs-3.1
+	!=kde-base/kdelibs-3.1-r1
+	!=kde-base/kdelibs-3.1-r2
+	!=kde-base/kdelibs-3.1-r3
+	!=kde-base/kdebase-3.1
+	!=kde-base/kdebase-3.1-r1
+	!=kde-base/kdebase-3.1.1"
+# WARNING: the versions blocked above are known to be buggy. DO NOT use them with this qt	
+
+RDEPEND="$DEPEND
+	doc? ( ~app-doc/qt-docs-$PV )"
+	
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+
+src_unpack() {
+
+	export QTDIR=${S}
+
+	unpack ${A}
+
+	cd ${S}
+	
+	epatch ${FILESDIR}/designer.diff
+	epatch ${FILESDIR}/${P}-qmlined.diff
+	epatch ${FILESDIR}/${P}-r3-qsocket.diff
+	epatch ${FILESDIR}/${P}-qlistview-dnd.diff
+	
+	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 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
+}
+
+src_compile() {
+    
+	# fix #11144; qt wants to create lock files etc. in that directory
+	[ -d "$QTBASE/etc/settings" ] && addwrite "$QTBASE/etc/settings"
+
+	export QTDIR=${S}
+	
+	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"
+	[ -n "$DEBUG" ]	&& myconf="${myconf} -debug" 		|| myconf="${myconf} -release -no-g++-exceptions"
+	
+	# avoid wasting time building things we won't install
+	rm -rf tutorial examples
+
+	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 ${QTBASE} -fast ${myconf} || die
+
+	export QTDIR=${S}
+
+	emake src-qmake src-moc sub-src sub-tools || die
+
+}
+
+src_install() {
+
+	export QTDIR=${S}
+
+	cd ${S}
+
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# libraries
+	dolib lib/libqt-mt.so.3.1.2 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designer}.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.1.2->3.1->3->.so
+	ln -s libqt-mt.so.3.1.2 libqt-mt.so.3.1
+	ln -s libqt-mt.so.3.1 libqt-mt.so.3
+	ln -s libqt-mt.so.3 libqt-mt.so
+
+	# libqt -> libqt-mt symlinks
+	ln -s libqt-mt.so.3.1.2 	libqt.so.3.1.2
+	ln -s libqt-mt.so.3.1		libqt.so.3.1
+	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}
+
+	# 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
+
+}
+pkg_postinst() {
+
+    ewarn "If you upgraded from QT 3.0.x to 3.1.x, you should remerge any copies"
+    ewarn "of kdelibs you have installed. Otherwise, other kde packages may not"
+    ewarn "compile properly. If you upgraded QT from 3.0.x to 3.1.x in the past"
+    ewarn "but have not remerged kdelib, since then, you should proobably do so now."
+
+}