Call qt4-build_pkg_postinst again. Fixes bug 212086 and bug 276864

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 184 insertions, 2 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 468a2588c90f..82bc05fc0d0f 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,13 @@
 # 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.62 2009/06/30 15:08:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.63 2009/07/07 21:32:13 hwoarang Exp $
+
+*qt-gui-4.5.2-r1 (07 Jul 2009)
+
+  07 Jul 2009; Markos Chandras <hwoarang@gentoo.org>
+  +qt-gui-4.5.2-r1.ebuild:
+  Call qt4-build_pkg_postinst again. Thanks to Ingmar Vanhassel. Fixes bug
+  212086 and bug 276864
 
   30 Jun 2009; Raúl Porcel <armin76@gentoo.org> qt-gui-4.5.1.ebuild:
   ia64/sparc stable wrt #266201
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index c25227063a8c..cf284d66d188 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -38,6 +38,7 @@ EBUILD qt-gui-4.4.2-r3.ebuild 5722 RMD160 79ee98acf0dabc3d6925a277f947e2786d1c20
 EBUILD qt-gui-4.5.1-r1.ebuild 5770 RMD160 9b6474f7a64cf9ccc37427707cbc650c80db9b8a SHA1 9dd3da3aa2a57eb3b96e47f27d85ce2b0f952d9f SHA256 a2a23597c602a2f0b8337174c4539df37617f083b749c5571e235d5ac6aa0981
 EBUILD qt-gui-4.5.1-r2.ebuild 5949 RMD160 31a4252375083ef3b6e96911b59eae816ccf90c7 SHA1 a4b57fe1c52bae6f46c16c508107d257adaaf71c SHA256 4d958b328b9a2b890a22817ed034b750d30946891d4be03cafb1de36b518d609
 EBUILD qt-gui-4.5.1.ebuild 5493 RMD160 e9fe7e5e1bed1b492e296330835635136f38fd1d SHA1 2ed6e707d7b818c5b276457a23dfc401dbad2d22 SHA256 0ad1a2bb09d98a19b1a736806e00dee7f8e62d8787d9818bcdf70d0f783bde60
+EBUILD qt-gui-4.5.2-r1.ebuild 5851 RMD160 9963b0cd5bd828b1d4cf0627270825738db4c5c1 SHA1 6251633c0766384ccf48194f099fe6a680e6aede SHA256 7421654952ca0f16ce0eac00111d8df3ca58670ceafacaf44dc2d33c424519ec
 EBUILD qt-gui-4.5.2.ebuild 5822 RMD160 57e08f8a1b94aee80b91d5eb65e38e833b2122e2 SHA1 b2eca06440acc05d26da27cacff6552f500bba03 SHA256 41f7e87c42900aae7d61672c7a92ac727d09636cadcea91a9919578b94d4752e
-MISC ChangeLog 9223 RMD160 b23d06342c1d721c5576b7239ca7233ec187cce8 SHA1 052616a4995c914ad7780f48dc714e514ad4e96d SHA256 ccfe3de2d37387ee906d133a3eaaf9a12563cb9e400a20a8ca1d9f57112872f9
+MISC ChangeLog 9436 RMD160 40047194e6eb10ef61bb5adb5276b158097975b5 SHA1 0c89a57ed6f07594958f7f0b1c8d4033a07fcd24 SHA256 c5c5a9e3ec10990be3283d57d448ffbf33c6e144defa6b2f16108d9bfc5e703d
 MISC metadata.xml 636 RMD160 d7e251319271eb08ec8a81f159b788399b72209b SHA1 ee1479223764214d8d9811dc5bc8bf7a1d95cfd7 SHA256 00175a33be6633a0cee53ef22c8db1f3d3e3c3bfddfcbef6cb95ff89065064b3
diff --git a/x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild
new file mode 100644
index 000000000000..879eb16567c0
--- /dev/null
+++ b/x11-libs/qt-gui/qt-gui-4.5.2-r1.ebuild
@@ -0,0 +1,174 @@
+# 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.2-r1.ebuild,v 1.1 2009/07/07 21:32:13 hwoarang Exp $
+
+EAPI="2"
+inherit eutils qt4-build
+
+DESCRIPTION="The GUI module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+accessibility cups dbus +glib gtk 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/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXfont
+	x11-libs/libSM
+	x11-libs/libXi
+	~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=] )
+	gtk? ( x11-libs/gtk+:2 )
+	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
+src/scripttools/
+tools/designer
+tools/linguist
+src/plugins/imageformats/gif
+src/plugins/imageformats/ico
+src/plugins/imageformats/jpeg
+src/plugins/inputmethods"
+
+QT4_EXTRACT_DIRECTORIES="
+include/
+src/
+tools/shared/"
+
+pkg_setup() {
+	if use raster; then
+		ewarn "WARNING: You have enabled raster backend rendering engine."
+		ewarn "This is a new feature and may lead to composite problems"
+		ewarn "screen corruption and broken qt4 or kde4 applications. "
+		ewarn "If you encounter such problems please"
+		ewarn "remove 'raster' use flag and re-compile qt-gui before"
+		ewarn "filling a bug on gentoo bugzilla."
+		ebeep 5
+	fi
+	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"
+	use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets"
+	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 gtk 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"
+
+	# Explicitly 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/*
+
+	# install correct designer and linguist icons, bug 241208
+	doicon tools/linguist/linguist/images/icons/linguist-128-32.png \
+		tools/designer/src/designer/images/designer.png \
+		|| die "doicon failed"
+	# Note: absolute image path required here!
+	make_desktop_entry /usr/bin/linguist Linguist \
+			/usr/share/pixmaps/linguist-128-32.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "linguist make_desktop_entry failed"
+	make_desktop_entry /usr/bin/designer Designer \
+			/usr/share/pixmaps/designer.png \
+			'Qt;Development;GUIDesigner' \
+			|| die "designer make_desktop_entry failed"
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		ewarn 'If you get the following error when setting Qt to use the GTK style:'
+		ewarn '    "QGtkStyle cannot be used together with the GTK_Qt engine."'
+		ewarn 'make sure you have GTK configured to NOT use the GTK_Qt engine and'
+		ewarn 'export GTK2_RC_FILES="$HOME/.gtkrc-2.0" in your environment.'
+	fi
+	qt4-build_pkg_postinst
+}