Version bump to Qt-4.4.0.

(Portage version: 2.1.5)

3 files changed, 142 insertions, 1 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index af2759e33fa5..3d8b9404c680 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.4 2008/04/10 13:40:47 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.5 2008/05/15 12:45:33 ingmar Exp $
+
+*qt-gui-4.4.0 (15 May 2008)
+
+  15 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/qt-gui-4.4.0-scrollbars.patch, +qt-gui-4.4.0.ebuild:
+  Version bump to Qt-4.4.0.
 
   10 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -qt-gui-4.4.0_beta1.ebuild, +qt-gui-4.4.0_rc1.ebuild:
diff --git a/x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch b/x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch
new file mode 100644
index 000000000000..0f754eb142b2
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-4.4.0-scrollbars.patch
@@ -0,0 +1,13 @@
+Bug 220751, Mikko Cal.
+
+--- src/gui/itemviews/qabstractitemview.cpp	2008-04-28 15:11:18.000000000 +0200
++++ src/gui/itemviews/qabstractitemview.cpp	2008-04-10 01:00:58.000000000 +0200
+@@ -2980,7 +2982,7 @@
+     if (q->isVisible()) {
+         q->doItemsLayout();
+         const QModelIndex current = q->currentIndex();
+-        if (current.isValid())
++        if (current.isValid() && state == QAbstractItemView::EditingState)
+             q->scrollTo(current);
+     } else {
+         doDelayedItemsLayout();
diff --git a/x11-libs/qt-gui/qt-gui-4.4.0.ebuild b/x11-libs/qt-gui/qt-gui-4.4.0.ebuild
new file mode 100644
index 000000000000..a89b86a38f3b
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.4.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0.ebuild,v 1.1 2008/05/15 12:45:33 ingmar Exp $
+
+EAPI="1"
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module(s) for the Qt toolkit."
+HOMEPAGE="http://www.trolltech.com/"
+
+LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_wacom"
+IUSE="+accessibility cups dbus debug glib mng nas nis tiff +qt3support xinerama ${IUSE_INPUT_DEVICES}"
+
+RDEPEND="
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfont
+	x11-libs/libSM
+	~x11-libs/qt-core-${PV}
+	~x11-libs/qt-script-${PV}
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV} )
+	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )
+	mng? ( >=media-libs/libmng-1.0.9 )
+	nas? ( >=media-libs/nas-1.5 )
+	tiff? ( media-libs/tiff )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/inputproto"
+
+QT4_TARGET_DIRECTORIES="
+src/gui
+tools/designer
+tools/linguist
+src/plugins/imageformats/gif
+src/plugins/imageformats/ico
+src/plugins/imageformats/jpeg"
+QT4_EXTRACT_DIRECTORIES="
+src/tools/rcc/
+tools/shared/"
+
+pkg_setup() {
+	use glib && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
+		~x11-libs/qt-core-${PV} glib"
+	use qt3support && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK}
+		~x11-libs/qt-core-${PV} qt3support"
+
+	qt4-build_pkg_setup
+}
+
+src_unpack() {
+	use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer"
+	use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng"
+	use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+	${QT4_EXTRACT_DIRECTORIES}"
+
+	qt4-build_src_unpack
+
+	# Don't build plugins this go around, because they depend on qt3support lib
+	sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-scrollbars.patch"
+}
+
+src_compile() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	local myconf
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use input_devices_wacom tablet)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use qdbus)
+		$(qt_use qt3support)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+
+	myconf="${myconf} -qt-gif -system-libpng -system-libjpeg
+		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
+		-xrender -xrandr -xkb -xshape -sm  -no-svg"
+
+	# Explictly don't compile these packages.
+	# Emerge "qt-webkit", "qt-phonon", etc for their functionality.
+	myconf="${myconf} -no-webkit -no-phonon -no-dbus -no-opengl"
+
+	qt4-build_src_compile
+}
+
+src_install() {
+	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
+		$(use input_devices_wacom && echo tablet) $(usev accessibility)
+		$(usev xinerama) $(usev cups) $(usev nas) gif png system-png system-jpeg
+		$(use mng && echo system-mng) $(use tiff && echo system-tiff)"
+	QCONFIG_REMOVE="no-gif no-png"
+	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
+	$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG
+	$(use mng && echo QT_IMAGEFORMAT_MNG) $(use nas && echo QT_NAS)
+	$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE
+	$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR
+	$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER"
+	qt4-build_src_install
+
+	domenu "${FILESDIR}"/{Designer,Linguist}.desktop
+}