Readd in xinerama use flag

5 files changed, 171 insertions, 5 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index f61b2d1615aa..3d6012491639 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,15 @@
 # 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.80 2003/08/04 13:35:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.81 2003/08/28 03:20:39 caleb Exp $
+
+qt-3.2.1 (27 Aug 2003)
+
+  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> qt-3.2.1.ebuild:
+  Version bump
+
+  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> qt-3.1.2-r4.ebuild:
+  Readd in xinerama use flag
+
 
 qt-3.2.0 (30 Jul 2003)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 43e09c678ac1..43e75d3dde10 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,12 +1,12 @@
 MD5 e630643cad12981507bbfd219a682122 qt-3.1.2-r3.ebuild 4987
 MD5 1d8d8c198d394864c303a4199327121d qt-2.3.2-r1.ebuild 2273
-MD5 abcaa36913fee2c8cd74cdcceec14654 qt-3.2.1.ebuild 4395
+MD5 203be6f0f438fb1e54ffad91e8460d15 qt-3.2.1.ebuild 4394
 MD5 6e148d3267616467a0d81a51f3e7482f qt-3.0.5-r2.ebuild 3899
 MD5 76b5e6ac1ef3966b07332b22b0c10b6a qt-3.1.0-r3.ebuild 4701
-MD5 31b2aee9551978abf3bc3a61c60edd69 qt-3.1.2-r4.ebuild 5199
+MD5 34d1aa00fb3f0033f20c7c4938f44ca4 qt-3.1.2-r4.ebuild 5198
 MD5 104c403a9bcbe41796a95144e1003abe qt-3.1.1-r2.ebuild 4516
 MD5 717723aeb7435affba01b53717048cd1 qt-3.2.0.ebuild 4346
-MD5 dda75f7085155cfce39ed79b6f9e92cf ChangeLog 13555
+MD5 9552e0298183928a6eea527049af2abf ChangeLog 13756
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
diff --git a/x11-libs/qt/files/digest-qt-3.2.1 b/x11-libs/qt/files/digest-qt-3.2.1
new file mode 100644
index 000000000000..bdba907c9968
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.2.1
@@ -0,0 +1 @@
+MD5 9ae022ffe7603ec34aba150f6cca257a qt-x11-free-3.2.1.tar.bz2 13981279
diff --git a/x11-libs/qt/qt-3.1.2-r4.ebuild b/x11-libs/qt/qt-3.1.2-r4.ebuild
index a946e4190a33..249e4ebcbf9c 100644
--- a/x11-libs/qt/qt-3.1.2-r4.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r4.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-r4.ebuild,v 1.5 2003/08/04 13:35:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.6 2003/08/28 03:20:39 caleb Exp $
 
 DESCRIPTION="QT version ${PV}"
 HOMEPAGE="http://www.trolltech.com/"
@@ -94,6 +94,7 @@ src_compile() {
 	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"
 	
 	# avoid wasting time building things we won't install
 	rm -rf tutorial examples
diff --git a/x11-libs/qt/qt-3.2.1.ebuild b/x11-libs/qt/qt-3.2.1.ebuild
new file mode 100644
index 000000000000..6ef6077f14f7
--- /dev/null
+++ b/x11-libs/qt/qt-3.2.1.ebuild
@@ -0,0 +1,155 @@
+# 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.ebuild,v 1.1 2003/08/28 03:20:39 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"
+IUSE="cups nas postgres opengl mysql odbc gif"
+
+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.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 )"
+RDEPEND="${DEPEND}"
+	#doc? ( ~app-doc/qt-docs- )"
+
+S=${WORKDIR}/${PV}
+	
+QTBASE=/usr/qt/3
+export QTDIR=${S}
+
+src_unpack() {
+	unpack ${A}
+
+	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
+}
+
+src_compile() {
+	# fix #11144; qt wants to create lock files etc. in that directory
+	[ -d "$QTBASE/etc/settings" ] && addwrite "$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    && mycong="${myconf} -xinerama"
+	
+	# 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() {
+	# binaries
+	into $QTBASE
+	dobin bin/*
+
+	# libraries
+	dolib lib/libqt-mt.so.3.2.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.2.0->3.2->3->.so
+	ln -s libqt-mt.so.3.2.0 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.0 libqt.so.3.2.0
+	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}
+
+	# 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
+}