Remove patches introduced for bug #64449. Fixes bug #90758.

Package-Manager: portage-2.0.51.19

4 files changed, 338 insertions, 26 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 7f9661e01a20..e71637e0dfa6 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.228 2005/06/17 20:59:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.229 2005/06/18 12:31:32 greg_g Exp $
+
+*qt-3.3.4-r5 (18 Jun 2005)
+
+  18 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> +qt-3.3.4-r5.ebuild:
+  Remove patches introduced for bug #64449. Fixes bug #90758.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> qt-3.3.4-r3.ebuild:
   Stable on ppc.
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index f2828a2c70c3..5803167eaaf6 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,40 +1,42 @@
 MD5 88875c77c2482de25169850cfc19faf5 qt-3.3.3-r1.ebuild 7987
-MD5 32ad8d8bffefcdf4d7885199b7c55890 qt-4.0.0_beta2-r3.ebuild 5983
-MD5 016c3e144c65ab89a45ffff611a9da54 qt-3.3.4-r3.ebuild 8950
-MD5 d9f916370f1950762a23b8f04dd22232 qt-4.0.0_rc1.ebuild 6125
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 d856090d95c3919f683295a27b38f7c2 ChangeLog 37915
+MD5 d9f916370f1950762a23b8f04dd22232 qt-4.0.0_rc1.ebuild 6125
+MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
+MD5 97fed8fbf48cf5353098d6f736d01383 qt-3.3.4-r5.ebuild 9088
+MD5 016c3e144c65ab89a45ffff611a9da54 qt-3.3.4-r3.ebuild 8950
+MD5 296d844b1aebc379dc3ea8e972cdde95 ChangeLog 38077
+MD5 32ad8d8bffefcdf4d7885199b7c55890 qt-4.0.0_beta2-r3.ebuild 5983
 MD5 75ce8582791a0d174df19da9843fafb9 qt-4.0.0_rc1-r2.ebuild 6711
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
-MD5 e5e1f28d1973386abc7d593bd7330d62 qt-3.3.4-r4.ebuild 9306
-MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4b2r3_nomkdir.patch 866
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.3-qclipboard-hack.patch 1662
-MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
-MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4rc1_nomkdir.patch 866
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r4 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
+MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
+MD5 bed89221628547eb8f12da37622493e0 files/digest-qt-4.0.0_rc1 90
+MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
 MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.3-flickerfree_qiconview_buffered.patch 3347
+MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
+MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
+MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.3-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r5 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
+MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
 MD5 99d57476c4605ca076db91f8f086a326 files/digest-qt-4.0.0_beta2-r3 100
-MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-MD5 2df2442dc59faeb8b545a81d2523cf28 files/qt-3.3.3-immodule-r123-event-inversion-20040909.diff 327
+MD5 efa1381655dae2c9afb77ac85fa6ef09 files/digest-qt-4.0.0_rc1-r2 104
 MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
-MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4rc1_nomkdir.patch 866
-MD5 77ee6484af384828441336443499ec0e files/digest-qt-3.3.3-r1 238
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
-MD5 bed89221628547eb8f12da37622493e0 files/digest-qt-4.0.0_rc1 90
 MD5 471c09f2792eec732d715a983b7f7244 files/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff 4150
+MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 e0a483959b1d3dad0fc58adc242624c1 files/qt-3.3.3-amd64-fullscreen.patch 1220
-MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147
-MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
-MD5 efa1381655dae2c9afb77ac85fa6ef09 files/digest-qt-4.0.0_rc1-r2 104
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
+MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4b2r3_nomkdir.patch 866
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r5 b/x11-libs/qt/files/digest-qt-3.3.4-r5
new file mode 100644
index 000000000000..d12b1ee1a446
--- /dev/null
+++ b/x11-libs/qt/files/digest-qt-3.3.4-r5
@@ -0,0 +1,2 @@
+MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722
+MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389
diff --git a/x11-libs/qt/qt-3.3.4-r5.ebuild b/x11-libs/qt/qt-3.3.4-r5.ebuild
new file mode 100644
index 000000000000..c5e3b1ee98ae
--- /dev/null
+++ b/x11-libs/qt/qt-3.3.4-r5.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r5.ebuild,v 1.1 2005/06/18 12:31:32 greg_g Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+SRCTYPE="free"
+DESCRIPTION="QT version ${PV}"
+HOMEPAGE="http://www.trolltech.com/"
+
+IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203"
+
+SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2
+	immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )
+	immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )"
+#	ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )"
+LICENSE="|| ( QPL-1.0 GPL-2 )"
+
+SLOT="3"
+KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc64 ~sparc ~ia64 ~ppc ~alpha"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc"
+
+DEPEND="virtual/x11 virtual/xft
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/libmng
+	>=media-libs/freetype-2
+	nas? ( >=media-libs/nas-1.5 )
+	odbc? ( dev-db/unixODBC )
+	mysql? ( dev-db/mysql )
+	firebird? ( dev-db/firebird )
+	opengl? ( virtual/opengl virtual/glu )
+	postgres? ( dev-db/postgresql )
+	cups? ( net-print/cups )
+	zlib? ( sys-libs/zlib )"
+
+S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV}
+
+QTBASE=/usr/qt/3
+
+pkg_setup() {
+	if use immqt && use immqt-bc ; then
+		ewarn
+		ewarn "immqt and immqt-bc are exclusive. You cannot set both."
+		ewarn "Please specify either immqt or immqt-bc."
+		ewarn
+		die
+	elif use immqt ; then
+		ewarn
+		ewarn "You are going to compile binary imcompatible immodule for Qt. This means"
+		ewarn "you have to recompile everything depending on Qt after you install it."
+		ewarn "Be aware."
+		ewarn
+	fi
+
+	export QTDIR=${S}
+
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		PLATCXX="g++"
+	elif [[ ${CXX/icc/} != ${CXX} ]]; then
+		PLATCXX="icc"
+	else
+		die "Unknown compiler ${CXX}."
+	fi
+
+	if use kernel_linux; then
+		PLATNAME="linux"
+	elif use kernel_FreeBSD && use elibc_FreeBSD; then
+		PLATNAME="freebsd"
+	elif use ppc-macos; then
+		PLATNAME=macx
+#		export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+#		export INSTALL_ROOT=""
+	elif use kernel_Darwin && use elibc_Darwin; then
+		PLATNAME="darwin"
+	else
+		die "Unknown platform."
+	fi
+
+	# probably this should be '*-64' for 64bit archs
+	# in a fully multilib environment (no compatibility symlinks)
+	export PLATFORM="${PLATNAME}-${PLATCXX}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i -e 's:read acceptance:acceptance=yes:' configure
+
+	# Do not link with -rpath. See bug #75181.
+	find ${S}/mkspecs -name qmake.conf | xargs \
+		sed -i -e 's:QMAKE_RPATH.*:QMAKE_RPATH =:'
+
+	# fix freeze caused by bad interaction with kde klipper (kde bug 80072)
+	epatch ${FILESDIR}/${P}-qclipboard-hack.patch
+
+	# KDE related patches
+	epatch ${FILESDIR}/0001-dnd_optimization.patch
+	epatch ${FILESDIR}/0002-dnd_active_window_fix.patch
+	epatch ${FILESDIR}/0037-dnd-timestamp-fix.patch
+	epatch ${FILESDIR}/0038-dragobject-dont-prefer-unknown.patch
+	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
+	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
+
+	if use immqt || use immqt-bc ; then
+		epatch ../${IMMQT_P}.diff
+		epatch ${FILESDIR}/${P}-immodule-focus.patch
+		sh make-symlinks.sh || die "make symlinks failed"
+	fi
+
+	if use ppc-macos ; then
+		gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch
+		epatch ${T}/${P}-darwin-fink.patch
+	fi
+
+	# set c/xxflags and ldflags
+	strip-flags
+	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
+	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		${S}/mkspecs/${PLATFORM}/qmake.conf || die
+
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:/lib$:/$(get_libdir):" \
+			${S}/mkspecs/${PLATFORM}/qmake.conf || die
+	fi
+}
+
+src_compile() {
+	export SYSCONF=${D}${QTBASE}/etc/settings
+
+	# Let's just allow writing to these directories during Qt emerge
+	# as it makes Qt much happier.
+	addwrite "${QTBASE}/etc/settings"
+	addwrite "${HOME}/.qt"
+
+	[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+
+	use nas		&& myconf="${myconf} -system-nas-sound"
+	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
+	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
+	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"
+	use firebird    && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase"
+	use sqlite	&& myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite"
+	use odbc	&& myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc"
+	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" || myconf="${myconf} -no-xinerama"
+	use zlib	&& myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib"
+	use ipv6        && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6"
+	use immqt-bc	&& myconf="${myconf} -inputmethod"
+	use immqt	&& myconf="${myconf} -inputmethod -inputmethod-ext"
+
+	if use ppc-macos ; then
+		myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-cups -lresolv -shared"
+		myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib"
+		myconf="${myconf} -L${S}/lib -I${S}/include"
+		sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die
+	fi
+
+	export YACC='byacc -d'
+
+	./configure -sm -thread -stl -system-libjpeg -verbose -largefile \
+		-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \
+		-system-libpng -xft -platform ${PLATFORM} -xplatform \
+		${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \
+		-fast ${myconf} -dlopen-opengl || die
+
+	emake src-qmake src-moc sub-src || die
+
+	export DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	emake sub-tools || die
+
+	if use examples; then
+		emake sub-tutorial sub-examples || die
+	fi
+
+	# Make the msg2qm utility (not made by default)
+	cd ${S}/tools/msg2qm
+	../../bin/qmake
+	emake
+
+}
+
+src_install() {
+	# binaries
+	into ${QTBASE}
+	dobin bin/*
+	dobin tools/msg2qm/msg2qm
+
+	# libraries
+	if use ppc-macos; then
+		# dolib is broken on BSD because of missing readlink(1)
+		dodir ${QTBASE}/$(get_libdir)
+		cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die
+
+		cd ${D}/${QTBASE}/$(get_libdir)
+		for lib in libqt-mt* ; do
+			ln -s ${lib} ${lib/-mt/}
+		done
+	else
+		dolib lib/lib{editor,qassistantclient,designercore}.a
+		dolib lib/libqt-mt.la
+		dolib lib/libqt-mt.so.3.3.4 lib/libqui.so.1.0.0
+		cd ${D}/${QTBASE}/$(get_libdir)
+
+		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.3.4->3.3->3->.so
+		ln -s libqt-mt.so.3.3.4 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.4 libqt.so.3.3.4
+		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
+	fi
+
+	# plugins
+	cd ${S}
+	local plugins=$(find plugins -name "lib*.so" -print)
+	for x in ${plugins}; do
+		exeinto ${QTBASE}/$(dirname ${x})
+		doexe ${x}
+	done
+
+	# Past this point just needs to be done once
+	is_final_abi || return 0
+
+	# includes
+	cd ${S}
+	dodir ${QTBASE}/include/private
+	cp include/* ${D}/${QTBASE}/include/
+	cp include/private/* ${D}/${QTBASE}/include/private/
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${QTBASE}/${libdir}"
+	done
+
+	# environment variables
+	cat <<EOF > ${T}/45qt3
+PATH=${QTBASE}/bin
+ROOTPATH=${QTBASE}/bin
+LDPATH=${libdirs:1}
+QMAKESPEC=${PLATFORM}
+MANPATH=${QTBASE}/doc/man
+EOF
+	cat <<EOF > ${T}/50qtdir3
+QTDIR=${QTBASE}
+EOF
+	insinto /etc/env.d
+	doins ${T}/45qt3 ${T}/50qtdir3
+
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib
+	fi
+
+	insinto ${QTBASE}/tools/designer
+	doins -r tools/designer/templates
+
+	insinto ${QTBASE}
+	doins -r translations
+
+	keepdir ${QTBASE}/etc/settings
+
+	if use doc; then
+		insinto ${QTBASE}
+		doins -r ${S}/doc
+	fi
+
+	if use examples; then
+		find ${S}/examples ${S}/tutorial -name Makefile | \
+			xargs sed -i -e "s:${S}:${QTBASE}:g"
+
+		cp -r ${S}/examples ${D}${QTBASE}/
+		cp -r ${S}/tutorial ${D}${QTBASE}/
+	fi
+
+	# misc build reqs
+	insinto ${QTBASE}/mkspecs
+	doins -r ${S}/mkspecs/${PLATFORM}
+
+	sed -e "s:${S}:${QTBASE}:g" \
+		${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache
+
+	dodoc FAQ README README-QT.TXT changes*
+	if use immqt || use immqt-bc ; then
+		dodoc ${S}/README.immodule
+	fi
+}