Fix bug #368515.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 31 insertions, 21 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 8f8a476191e9..6bed01a864aa 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.155 2011/11/28 21:01:19 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.156 2011/11/28 22:52:01 pesa Exp $
+
+  28 Nov 2011; Davide Pesavento <pesa@gentoo.org> qt-gui-4.7.4.ebuild,
+  qt-gui-4.7.4-r1.ebuild:
+  Fix bug #368515.
 
 *qt-gui-4.7.4-r1 (28 Nov 2011)
 
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index e98d400d92d7..978fe2f31ae0 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX qt-gui-4.7.3-cups.patch 3297 RMD160 fc99e57ccfa8db47a1df799186d6daedcbdf744d SHA1 d712b9b570101de5c996692551ba5a3ae4a410e9 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33
 AUX qt-gui-4.7.4-fix-libreoffice-crash.patch 1958 RMD160 da10c0614e4ecb8f6f3c705d191503a42e174659 SHA1 652fc396b99846d1f2fe334c15f4cd4b8599806b SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844
 DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba274c4150b02162bba40b65a872 SHA1 977c10b88a2230e96868edc78a9e3789c0fcbf70 SHA256 176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
@@ -12,7 +15,24 @@ EBUILD qt-gui-4.6.3.ebuild 5425 RMD160 5a00504271c422b716580984ef70db235c5cadeb
 EBUILD qt-gui-4.7.2.ebuild 6350 RMD160 a47834c6bc9471eeb188fd26ca1394083b08225a SHA1 8e34ec70e3a1a10a7302171629f8754ea13eabdf SHA256 43e21b9cea2aac8d8ee82d46585168436bfad570e3e0695244eb300d41c02110
 EBUILD qt-gui-4.7.3-r1.ebuild 6427 RMD160 c1d4cd7af792f651fd5069e17726cc3a385ea771 SHA1 da17d96980cd6eac27d2455ecb7143320d7f066a SHA256 3a1ef0d23c057e050145495d387858ca5cdbe855e9dc6211aae1f6547379dc98
 EBUILD qt-gui-4.7.3.ebuild 6374 RMD160 9f7ae199e8b8b3b0fbd228c2d9f388e644136775 SHA1 43461e8c0d2326f3569212576c2c50bd3862a73f SHA256 84567f427bf5279606a316b8003b3518b2a4a116c09624d384d983a415299205
-EBUILD qt-gui-4.7.4-r1.ebuild 6462 RMD160 e11253c7cf182299d99c396a34cb7ff48b09bb80 SHA1 bc925bb4c61f088735fdb44e2b5993a4e61947d5 SHA256 71d89be18fe0554d3fd452465438cec9efff6c6716154c97eca5c8ddfd186b6d
-EBUILD qt-gui-4.7.4.ebuild 6404 RMD160 bc0105c42260dac1d640200a5450e5bc6ad2eda0 SHA1 751ad3bb38b8a0ab25430b9e206f7bfeda38a1a9 SHA256 f9c066760a312306e8da2973a35f2467fc8a86662a8e5a88b5442ae387d5773d
-MISC ChangeLog 23558 RMD160 ce4a21019eeeeb2390b7c85e72639bf1d15cb045 SHA1 8e066b780f52676829534f3c1046bdfbee2c34fc SHA256 8c91a0d3a7a845ce6b6e95b587af1a233cced0a0f677c6114df0863188709818
+EBUILD qt-gui-4.7.4-r1.ebuild 6221 RMD160 0abdcad841da83d9a464b8eee4ddd935e5d9ca58 SHA1 3e33dabda9ca51ee86d0d0c1c01b05ac38a4ec11 SHA256 1da30c9e42fa7d73e033a38d51c02736fcfbbca92f78b40c0b852a7bfa5fd240
+EBUILD qt-gui-4.7.4.ebuild 6169 RMD160 7f15d86f439a3dc4bc7a6e017208dbe41280405a SHA1 0bebd1b5ac74f414c5010398f416345503022057 SHA256 47714fd101a43dc994633a00bc5297d151b526efc080c6eff4304e6906188256
+MISC ChangeLog 23670 RMD160 2f43a2044d9acbba0e9ffb1ac7c9edf07d4b4585 SHA1 d37b66e3f14c36a65fe7dfa730dcbe5fcff459c6 SHA256 bb53a8187a0aa2d497d438744bdf3a8767c6a2bffda0fc20d2317aef29552f9e
 MISC metadata.xml 1181 RMD160 74e177f4c687acb1df2637f28ac36cc80b4f224e SHA1 3ea8a8aba7d077d6a008b8360811f4e43538232b SHA256 49515885af0ad4b13d4f93911c0b8b84e25abcda3fdc8e5715b1aa956b18af15
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJO1BCYAAoJENXLsxwXqFxyZpkP/R6iOEYGwLvtZCqLxwDjZ63d
+sopkHLceYUXQst6gUjNHeoSAS/iCQdM87o7lNiXVSZ8+SK6HuaskUgs9qMcXtCfu
+LtVSGS00y4CKx//GJHTRvn/wdDwq2CJgUp4lfUiQP9e8vqFS++m1dNLWXxmKoNsm
+woPK4RxptHnJ+Q/vIz3vhOhRZJxF7cfS9DbEZOjA7IdCxjQ/LMdOrDPiQX6lHN/x
+m3mp44OAvcQXT9n9DKrmUo4LCXCBmYWtWxvt9vEHhy6r9r1pQW/e13gKDeGrg1R2
+zgV5bX55HtPuR+Mx6uZwUNGSt/VhnUelAJTWFfHMLt8PWC7oK1PetOMsWjPBoti5
+rAwgbi2eyVzXUSuRclGDIpqu9l9CUP9bLQ3DqX9vTFFxqhycBJb+Hjyua6IdMbdP
+TiW8pt04mgh3N/PPWnVB5HdopyEGRrIx4lDvdNuxm/KF2V3oPrcZqGBJXaXZ8Gt3
+gzeIZCyYnOReZCmkmz4k9hYPkdBr8icMmzIWK/kca5HN98F7yJteqzccgICIR8l8
+GrHQOMJk+ctEzU/FhpQ5opwnVJfQdV4yUN/zjmi6MWeXH93CDjthenZxKa9QFBWx
+AnAJu5i0RTIRy+FZSoI/a9xWrU4/EjQNlXJFUbJ1CyupEZ3mRfXj7YRRpB+uECnn
+PiYFP12JiiB22Jq2/W9r
+=aa4N
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
index 7b9a59ce8fd1..651ebcc66fb5 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7.4-r1.ebuild,v 1.1 2011/11/28 21:01:19 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild,v 1.2 2011/11/28 22:52:01 pesa Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -43,7 +43,7 @@ RDEPEND="${RDEPEND}
 	!~x11-themes/qgtkstyle-4.7.2"
 PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )"
 
-PATCHES=( 
+PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-cups.patch"
 	"${FILESDIR}/${P}-fix-libreoffice-crash.patch"
 )
@@ -144,13 +144,6 @@ src_install() {
 
 	qt4-build_src_install
 
-	# remove unnecessary Windows headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
-	# remove Mac OS X headers
-	use aqua || rm -f \
-		"${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
-		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
 	# qt-creator
 	# some qt-creator headers are located
 	# under /usr/include/qt4/QtDesigner/private.
diff --git a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild
index e67e6fbf44bb..0a8ea35aded3 100644
--- a/x11-libs/qt-gui/qt-gui-4.7.4.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7.4.ebuild,v 1.3 2011/11/20 20:23:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4.ebuild,v 1.4 2011/11/28 22:52:01 pesa Exp $
 
 EAPI="3"
 inherit confutils qt4-build
@@ -141,13 +141,6 @@ src_install() {
 
 	qt4-build_src_install
 
-	# remove unnecessary Windows headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h
-	# remove Mac OS X headers
-	use aqua || rm -f \
-		"${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \
-		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
-
 	# qt-creator
 	# some qt-creator headers are located
 	# under /usr/include/qt4/QtDesigner/private.