From 714eb628b79d05bdba035d39323c3ddcc4bf200e Mon Sep 17 00:00:00 2001
From: Leonardo Valeri Manera <lvalerimanera@gmail.com>
Date: Fri, 9 May 2008 10:11:26 +0200
Subject: [PATCH] eclass/qt4-qt-copy.eclass: ...

---
 eclass/qt4-qt-copy.eclass   | 21 +++++++--------------
 x11-libs/qt-script/Manifest |  1 -
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/eclass/qt4-qt-copy.eclass b/eclass/qt4-qt-copy.eclass
index 9b006bd..4148b7a 100644
--- a/eclass/qt4-qt-copy.eclass
+++ b/eclass/qt4-qt-copy.eclass
@@ -18,7 +18,7 @@ inherit eutils qt4-build
 case ${PVR} in
 	4.4.0_rc1)
 		case ${PN} in
-			qt-core|qt-dbus|qt-gui|qt-qt3support|qt-script)
+			qt-core|qt-dbus|qt-gui|qt-qt3support)
 				QT_COPY_PV="1.2"
 				;;
 		esac
@@ -38,24 +38,19 @@ fi
 qt4_qt-copy() {
 	case ${PVR} in
 		4.4.0_rc1)
-			local patches_corelib_io patches_corelib_kernel \
+			local patches_corelib_io \
 				patches_gui_graphicsview patches_gui_image patches_gui_kernel patches_gui_text patches_gui_widgets \
 				patches_qt3support_text
 			patches_corelib_io="
 				0167-fix-group-reading.diff"
-			patches_corelib_kernel="
-				0180-window-role-corelib.diff"
 			patches_gui_graphicsview="
 				0214-fix-qgraphicsproxywidget-tab-crash.diff"
 			patches_gui_image="
 				0223-fix-qpixmap-hasalpha.diff
 				0224-fast-qpixmap-fill.diff"
-			#patches_gui_kernel="
-			#	0180-window-role-gui.diff
-			#	0195-compositing-properties.diff
-			#	0220-no-x-recursion-in-xerrhandler.diff"
 			patches_gui_kernel="
-				0180-window-role-gui.diff"
+				0195-compositing-properties.diff
+				0220-no-x-recursion-in-xerrhandler.diff"
 			patches_gui_text="
 				0203-qtexthtmlparser-link-color.diff"
 			patches_gui_widgets="
@@ -64,12 +59,10 @@ qt4_qt-copy() {
 				0210-fix-crash-q3stylesheet-font-size.diff"
 
 			local qt_core_patches qt_dbus_patches qt_gui_patches qt_qt3support_patches qt_script_patches
-			qt_core_patches="${patches_corelib_io} ${patches_corelib_kernel}"
-			qt_dbus_patches="${patches_corelib_io} ${patches_corelib_kernel}"
-			#qt_gui_patches="${patches_gui_graphicsview} ${patches_gui_image} ${patches_gui_kernel} ${patches_gui_text} ${patches_gui_widgets}"
-			qt_gui_patches="${patches_gui_kernel}"
+			qt_core_patches="${patches_corelib_io}"
+			qt_dbus_patches="${patches_corelib_io}"
+			qt_gui_patches="${patches_gui_graphicsview} ${patches_gui_image} ${patches_gui_kernel} ${patches_gui_text} ${patches_gui_widgets}"
 			qt_qt3support_patches="${patches_qt3support_text}"
-			qt_script_patches="${patches_corelib_kernel}"
 			;;
 		*)
 			eerror "Version ${PVR} is not supported by the qt4-qt-copy eclass!"
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index 80cd0f2..da17ee4 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -1,4 +1,3 @@
-DIST qt-copy-4.4.0_rc1-patches-1.2.tar.lzma 5266 RMD160 91233ac1fa44ebc5bea2df8bd5c43a3b85912ff9 SHA1 4e8a825d1fe24b73cb581c9c1cee799291e1dbc5 SHA256 4a3c0741bd8341233f2a52a862814ca45edd77b1d81fe3a7c49284863d597d73
 DIST qt-x11-opensource-src-4.4.0-rc1-headers.tar.bz2 2526180 RMD160 2658570a226d3f505cd4a2a3660b8f0427d43995 SHA1 24bb371329af5d82a7f2016c845b9e79c4e569d5 SHA256 d446a922da30e8834bdaa27f40b78c55f150e1c98c937cf8a403f26bbfc3e750
 DIST qt-x11-opensource-src-4.4.0-rc1.tar.bz2 97480693 RMD160 909613dd1acb9dd6138c494e8523ae33047cfa4d SHA1 1d9245c1333aaafc2dda7d138101d300318fada5 SHA256 b6634ca2bc6eb38986f46432161ee0cf94476d5c6a3a3bb300ce82f613596cdc
 EBUILD qt-script-4.4.0_rc1.ebuild 1008 RMD160 6a4aa93f4c2807258834651c7af6ddf9c6be5c51 SHA1 b6c542eb52490aa609060d770220c75265946fe5 SHA256 c30f5f0a2381dc6c99c4522c707ddf9021fa06a1378f4a2940c9ff4d4e87e21f
-- 
2.11.4.GIT