added designer.diff, revision bumped 3.1.0 and 3.1.1

6 files changed, 361 insertions, 1 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index e3e176721ff1..9a0049be9d07 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.47 2003/01/08 17:58:05 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.48 2003/01/28 12:04:40 hannes Exp $
+
+*qt-3.1.0-r2 (28 Jan 2003)
+*qt-3.1.1-r1 (28 Jan 2003)
+
+  28 Jan 2003; Hannes Mehnert <hannes@gentoo.org> qt-3.1.0-r2.ebuild,
+  qt-3.1.1-r1.ebuild: added designer.diff which fixes bug #12964.
 
   07 Jan 2003; Hannes Mehnert <hannes@gentoo.org> qt-2.3.2-r1.ebuild:
   removed !x11-libs/xft from DEPEND, added -no-xft to configure. really better
diff --git a/x11-libs/qt/files/designer.diff b/x11-libs/qt/files/designer.diff
new file mode 100644
index 000000000000..96ad6c2802d1
--- /dev/null
+++ b/x11-libs/qt/files/designer.diff
@@ -0,0 +1,16 @@
+--- src/tools/qlibrary_unix.cpp.old	2003-01-28 12:40:51.000000000 +0100
++++ src/tools/qlibrary_unix.cpp	2003-01-28 12:41:03.000000000 +0100
+@@ -141,13 +141,6 @@
+     if ( !pHnd )
+ 	return TRUE;
+ 
+-    if ( dlclose( pHnd ) ) {
+-#if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT)
+-	qWarning( "%s", dlerror() );
+-#endif
+-	return FALSE;
+-    }
+-
+     pHnd = 0;
+     return TRUE;
+ }
diff --git a/x11-libs/qt/files/digest-qt-3.1.0-r2 b/x11-libs/qt/files/digest-qt-3.1.0-r2
new file mode 100644
index 000000000000..5601495b3a0e
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.1.0-r2
@@ -0,0 +1 @@
+MD5 594a00a7eeb463251ef56515d6f81b0a qt-x11-free-3.1.0.tar.bz2 13375991
diff --git a/x11-libs/qt/files/digest-qt-3.1.1-r1 b/x11-libs/qt/files/digest-qt-3.1.1-r1
new file mode 100644
index 000000000000..d4b747ade4b0
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.1.1-r1
@@ -0,0 +1 @@
+MD5 977b9f59eed14f33343a797544b5418a qt-x11-free-3.1.1.tar.bz2 12393902
diff --git a/x11-libs/qt/qt-3.1.0-r2.ebuild b/x11-libs/qt/qt-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..376a93d4f538
--- /dev/null
+++ b/x11-libs/qt/qt-3.1.0-r2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2002 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.0-r2.ebuild,v 1.1 2003/01/28 12:04:40 hannes 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"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+
+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
+	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 )"
+	
+
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+
+src_unpack() {
+
+	export QTDIR=${S}
+
+	unpack ${A}
+
+	cd ${S}
+
+	# this patch fixes child windows being hidden randomly.
+	epatch ${FILESDIR}/${P}-minimized.diff
+	epatch ${FILESDIR}/designer.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
+	# 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
+	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 \
+		-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.0 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.0.3->3.0->3->.so
+	ln -s libqt-mt.so.3.1.0 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.0 	libqt.so.3.1.0
+	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 of kdelibs"
+	ewarn "you have installed. Otherwise, other kde packages may not compile properly."
+	ewarn "If you upgraded QT from 3.0.x to 3.1.x in the past but have not remerged kdelibs"
+	ewarn "since then, please do so now."
+
+}
diff --git a/x11-libs/qt/qt-3.1.1-r1.ebuild b/x11-libs/qt/qt-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..5eddf9d3adf5
--- /dev/null
+++ b/x11-libs/qt/qt-3.1.1-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2002 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.1-r1.ebuild,v 1.1 2003/01/28 12:04:40 hannes 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"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+
+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
+	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 )"
+	
+
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+
+src_unpack() {
+
+	export QTDIR=${S}
+
+	unpack ${A}
+
+	cd ${S}
+	
+	epatch ${FILESDIR}/designer.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
+	# 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
+	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.1 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.1->3.1->3->.so
+	ln -s libqt-mt.so.3.1.1 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.1 	libqt.so.3.1.1
+	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 of kdelibs"
+    ewarn "you have installed. Otherwise, other kde packages may not compile properly."
+    ewarn "If you upgraded QT from 3.0.x to 3.1.x in the past but have not remerged kdelibs"
+    ewarn "since then, please do so now."
+
+}