Don't define QT_MITSHM (partially reverts a previous commit).

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 25 insertions, 21 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 145e16055b0b..ca0aa7ec4a2d 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.220 2013/02/09 08:34:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.221 2013/02/09 11:58:26 pesa Exp $
+
+  09 Feb 2013; Davide Pesavento <pesa@gentoo.org> qt-gui-4.8.4-r1.ebuild,
+  qt-gui-4.8.4.ebuild:
+  Don't define QT_MITSHM (partially reverts a previous commit).
 
 *qt-gui-4.8.4-r1 (09 Feb 2013)
 
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 63d3532d1e79..a0ae056b4827 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 AUX CVE-2013-0254.patch 6449 SHA256 c25f54ed3fdfed4cc945e53f7a848f88be8bda899c8ebff904f241cf9096df3e SHA512 957d1f3e5ca9a8585e0e5c806cd0ea731e97a3b05cf60e84aef44912cbd9b8db80961f336f91734f9759d14d4e0de39a73becb45f58ca8af831c1780e5368739 WHIRLPOOL 633cba444159eb134ec2df8a4b4fbb145aea28012b75353c9684f3d47b1c50736ea7c5adbd4fa1fbb0bf285a1e517b122bb6b5edac1313f6578465c8381d60d9
 AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
-EBUILD qt-gui-4.8.4-r1.ebuild 8088 SHA256 73ccb8af930db847779c379383ad0a2b0ade1ba6ae95ab39bb9f64a57a628ae5 SHA512 bcd698887de53b227c02eea452cae2974ac70fa2d75ffbf0fb001b180fafda1883a4ec37b06bce0dd0795f8901c6a64ca6eb50ad36bbc82e2a1018f9e7069e30 WHIRLPOOL c3a2cbe935e2ed55a44df7907c7a39bd79fafcae42f31da13bc3e44aaff6366eb4537d95e12c40346b53434011d2de084ad9e2b65057a55c5c7ab7ea577c4fa1
-EBUILD qt-gui-4.8.4.ebuild 8042 SHA256 6197fe45ef6b651cd36589bc8fb5b55cc49b5143f8264a4bbefbb3be07fc0649 SHA512 9832e9fcc2bcab5ddacfbdc5faceb68c30fff4b7863693fdf470f6f4c6dad12a452c592e9e48f430900c8920b5a05ad3c3d4a00a769d71448e27234f06b176f3 WHIRLPOOL a994f931794871ad0e15aee69c78ae6eb008717ebf18cfc8c6c470eb13f490a4e9801aaed0c7fdde89c3cbe94f8b24fd4c75493285cece21820d789dd37eac04
-MISC ChangeLog 32479 SHA256 ba394ce1bd75772fd46d0530ff2d20d4e2dae9e95323610f7606423c1d995eb8 SHA512 5213ea40796377a96c394bde79a79b0c70a7bc87b2c6febfb999929a768dabc53cab1d357c3f9097903dbf1755de2a23bf352bcbb72964264f5464e90b6a3e65 WHIRLPOOL c7731e4b4a9c07b849b3a655d54569f2905ea209c2fa63fb4842d9650ff13cdc547270e57db5b5b4a6ebe96004dd31a83197ac75c03ba689a4de2eb83a22dcac
+EBUILD qt-gui-4.8.4-r1.ebuild 8078 SHA256 e8f74e64ec8aa427ebcd9c5caf335c4079f8139dfa0f41cbf63a8485d23ceb5b SHA512 0872b136e6278c5548746b05461010ef7fb9af2f7044bcf5f90d901231bbd2c52628a296960545b09a79fe74996d659a907a99613a1467004cf95f9e4bc7f3f8 WHIRLPOOL eb087d215420e4c2363072d98ba617fc1270f65f45ebb760c8cde595edb5eb91fee769a81d2d2210893fd75b69b4fdf27833d65419d62e1b52f4f2c5ffe1333d
+EBUILD qt-gui-4.8.4.ebuild 8032 SHA256 c95a1174ff96e31b4c0085561f74d04f7b3b44da37cb295670cc914562f4a7e8 SHA512 760d5e52fb6b9d61c283b439cdafec684727e9b2a3bd36e498aa408255c0e5b16718267a317c3a3b2238e916e630a76b6676acc1b932caa05382c3d11f463ff9 WHIRLPOOL 35645f11176590aff8712020a6209afa6cbb4eb40121b48d468cf258b53aa6625f5d5701cc80025dfc50f7fc038665dcf246dad0134a4a0725459de374e354d0
+MISC ChangeLog 32641 SHA256 e1d4b24dfbcfb49f253e693171ac1bc7590f0366bc64bc09f6d5e71d0d22b65d SHA512 68395c60cb45453ee1136eb358a3a9653ad34e5516aa908713e90afcb1e204ebd928bff5b322117ced69303a28e38c89f31ce4ed73c811b2076557218b242309 WHIRLPOOL 81ae49619f6c1ef1ff9632eb4f773714066359da1229ebb144abe28d647699614badfc8f0bc2b491549ae253710c91dc0881c7fa408162a3937a5f7cf2693b59
 MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFgoZAAoJENXLsxwXqFxy+1cQALVj+dcVTAolHGKhI+d1BgVW
-KOdKkE4LRpQJCHFrtsF692DunzK0ntHBrqKxKTTX+Ko7vT/7WwTq1YGR9PDTS79t
-MAGKYipcZCSNFrhzECpwF4XmECSMRNiHep09nyTs2vEFkN2YqVB6NwW/ZaKnQ+bK
-NMCrgEX2gBWBV6t5LEPaF3JgfESeiaCt29hcAPEsYzu3fUVmMsN91lsV+RcEZY13
-f/GMjrFd/r2G7zU3oUF0RvB1UyTCIUzXGp7TM6A4ZWCGT1NMj/Hqh1pKh+T3a83m
-SYe9hC9zK98LVZ7ZccEi7tasFJzIiXBwPNd3iO5EYKW/oJhuIMyoIoE1zgSFlSMx
-1V5RULvoTkfAa8W197dau79TlZPcLPKebZ0A7zkcUX5YW8cuEgEWOnNOP6ZbIcfB
-tz8TP691Lqkzc6drdTQVuhgPzRnTOiNxJ834ojkknYdPvBx8kvbbKSyEBNz2CXnG
-tokAmtWR85op4h7tsEmO7lNdQamBWuNkh21C8khCVOy5SIM7onx3+vnMvrV8Kx+c
-KJ5PxoBqG6SigFKLqXf7FT53llFziewjvNU4Nz//k126DC0VqoIZVpoKEwItWRVX
-w79MfJBrNGY4rP0sJewPAP9kUI7EdjDuCorkCLP2fUY0ysL+R7/a5n03GCYsYFNw
-KKRCIrhARmddsh4LAG04
-=Lh3h
+iQIcBAEBCAAGBQJRFjnkAAoJENXLsxwXqFxy8CkQAIPP+vFQFg4l0kE3/AJIdZ/L
+uYPgybq/iUbo57tp6/EnI0cioARNLBRLUw1HSJoviCoZ/UAPAEbejdSgNLD1dB8H
+kDxyekCZqYHvqmaEiVjwgR608a75f38JxKIP33r2ZL3jyYCxaw6USnHq278KheDP
+8FniBos1npQdjPq5b7E/zv5qbxeC2FxF2ETBjMgQy2H2CxNxocSA0k/qucooexs2
+Xacpy6y5WXWAb/Y7K/ui0d9ywEndwofbzJEhO9zBp+T+c7TOC0wMbT5t5Jlrdg56
+1Cww0QsfD5Q9OzBFmpneMGMO5Duso7rX4PxB/3q5rjiVf2Pp3Jhy4ayaL73GlT25
+cV+IFdyu62qXrytWKRc+GvJt9winqNnRRtE3IcmaX06kkCQoSok8QzROkGVk6AEK
+mZyQC3lne4+Pb4UPwLfQlVW1fi3cg04vMg+mxnkSMDFFbHle8E9NEjn9I7PxtPVa
+YhsHPYevdLg7m4bvYeTBkfs8X1rjAgIV4NUznN4vKmCnsiiRkyKROCmWIa1posb1
+IRVCmRPjdQLU+YVNkqWoBmeT78hVSw9803dXtE5kzXoYrSb5zM5/V6fL5SVw96Me
+fn04v3KJYANcySKhcgljZcd4QKcrneecgUbiiP6NaVTwSxD3H6k2xgHaFfGr8apg
+REgCLRbH7Hltaiwrntht
+=fxqc
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild
index 8705bbff4500..393a6a080c9a 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.4-r1.ebuild,v 1.1 2013/02/09 08:34:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4-r1.ebuild,v 1.2 2013/02/09 11:58:26 pesa Exp $
 
 EAPI=4
 
@@ -180,7 +180,7 @@ src_install() {
 			$(use egl && echo QT_EGL)
 			QT_FONTCONFIG
 			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG QT_MITSHM
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
 			$(use mng && echo QT_IMAGEFORMAT_MNG)
 			$(use nas && echo QT_NAS)
 			$(use nis && echo QT_NIS)
diff --git a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
index c80a4c4615a0..9080c3591759 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.4.ebuild,v 1.13 2013/01/27 00:41:32 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4.ebuild,v 1.14 2013/02/09 11:58:26 pesa Exp $
 
 EAPI=4
 
@@ -179,7 +179,7 @@ src_install() {
 			$(use egl && echo QT_EGL)
 			QT_FONTCONFIG
 			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG QT_MITSHM
+			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
 			$(use mng && echo QT_IMAGEFORMAT_MNG)
 			$(use nas && echo QT_NAS)
 			$(use nis && echo QT_NIS)