Qt 4.5.0_rc1 version bump

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 145 insertions, 2 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index ab5b4e960714..f2f75d5b6dcd 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.26 2009/02/06 16:25:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.27 2009/02/11 23:16:48 yngwin Exp $
+
+*qt-gui-4.5.0_rc1 (11 Feb 2009)
+
+  11 Feb 2009; Ben de Groot <yngwin@gentoo.org> +qt-gui-4.5.0_rc1.ebuild:
+  Version bump
 
   06 Feb 2009; Raúl Porcel <armin76@gentoo.org> qt-gui-4.4.2-r1.ebuild:
   ia64/sparc stable wrt #248038
diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index c7a436a80508..a9ad16fd48a4 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qt</herd> 
+  <herd>qt</herd>
   <use>
     <flag name='glib'>
       Enable <pkg>dev-libs/glib</pkg> eventloop support
     </flag>
+	<flag name='gtkstyle'>
+	  Build the Qt-GTK+ style, which integrates Qt4 apps with the GTK+ theme
+	</flag>
     <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that
       this does not mean you can compile pure Qt3 programs with Qt4.
     </flag>
+	<flag name='raster'>
+	  Use the alternative raster graphicssystem as default rendering engine
+	</flag>
   </use>
 </pkgmetadata>
diff --git a/x11-libs/qt-gui/qt-gui-4.5.0_rc1.ebuild b/x11-libs/qt-gui/qt-gui-4.5.0_rc1.ebuild
new file mode 100644
index 000000000000..8c7568ac3408
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.5.0_rc1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2009 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.5.0_rc1.ebuild,v 1.1 2009/02/11 23:16:48 yngwin Exp $
+
+EAPI="2"
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+accessibility cups +dbus +glib +gtkstyle mng nas nis raster tiff +qt3support xinerama"
+
+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}[debug=,glib=,qt3support=]
+	~x11-libs/qt-script-${PV}[debug=]
+	cups? ( net-print/cups )
+	dbus? ( ~x11-libs/qt-dbus-${PV}[debug=] )
+	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"
+PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[debug=] )"
+
+QT4_TARGET_DIRECTORIES="
+src/gui
+tools/designer
+tools/linguist
+src/plugins/imageformats/gif
+src/plugins/imageformats/ico
+src/plugins/imageformats/jpeg"
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/shared/"
+
+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
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# 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
+
+	# fixing hardcoded fonts, bug #252312
+	EPATCH_OPTS="--ignore-whitespace"
+	epatch "${FILESDIR}"/hardcoded_fonts.patch
+}
+
+src_configure() {
+	export PATH="${S}/bin:${PATH}"
+	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+
+	myconf="$(qt_use accessibility)
+		$(qt_use cups)
+		$(qt_use glib)
+		$(qt_use mng libmng system)
+		$(qt_use nis)
+		$(qt_use tiff libtiff system)
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)
+		$(qt_use gtkstyle)
+		$(qt_use xinerama)"
+
+	use nas	&& myconf="${myconf} -system-nas-sound"
+	use raster && myconf="${myconf} -graphicssystem raster"
+
+	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_configure
+}
+
+src_install() {
+	QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig
+		$(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
+
+	# remove some unnecessary headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
+		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
+
+	# qt-creator
+	# some qt-creator headers are located
+	# under /usr/include/qt4/QtDesigner/private.
+	# those headers are just includes of the headers
+	# which are located under tools/designer/src/lib/*
+	# So instead of installing both, we create the private folder
+	# and drop tools/designer/src/lib/* headers in it.
+	dodir /usr/include/qt4/QtDesigner/private/
+	insinto /usr/include/qt4/QtDesigner/private/
+	doins "${S}"/tools/designer/src/lib/shared/*
+	doins "${S}"/tools/designer/src/lib/sdk/*
+
+	domenu "${FILESDIR}"/{Designer,Linguist}.desktop
+}