From 5d3489d29031803ea567034c72c15fb77050213a Mon Sep 17 00:00:00 2001
From: Leonardo Valeri Manera <lvalerimanera@gmail.com>
Date: Wed, 7 May 2008 10:47:27 +0200
Subject: [PATCH] eclass/qt4-qt-copy.eclass: prettify ...

---
 eclass/qt4-qt-copy.eclass | 65 ++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/eclass/qt4-qt-copy.eclass b/eclass/qt4-qt-copy.eclass
index fdbd72f..b78d873 100644
--- a/eclass/qt4-qt-copy.eclass
+++ b/eclass/qt4-qt-copy.eclass
@@ -15,13 +15,13 @@ EAPI="1"
 
 inherit eutils qt4-build
 
-case ${PVR} in
-	4.4.0_rc1*)
+case ${PN},${PVR} in
+	*,4.4.0_rc1)
 		QT_COPY_PV="1.0"
 		;;
-	*)
-		eerror "Version ${PVR} does not have patchset defined in the qt4-qt-copy eclass!"
-		die "Unsupported version for patchset, something screwed up bad, boss."
+	*,*)
+		eerror "${PN}-${PVR} does not have patchset defined in the qt4-qt-copy eclass!"
+		die "Unsupported package-version for patchset, something screwed up bad, boss."
 		;;
 esac
 
@@ -34,14 +34,10 @@ fi
 qt4_qt-copy() {
 	# sed -e 's:[0-9]*:&_all_:' -e 's:_all_-:_all_:'
 
-	cd "${S}"
-
-	echo "lzma -dc ${DISTDIR}/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma | tar xf - --no-same-owner"
-	lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma | tar xf - --no-same-owner
-
 	case ${PVR} in
-		4.4.0_rc1*)
-			base_patches="0216_all_allow-isystem-for-headers.diff"
+		4.4.0_rc1)
+			base_patches="
+				0216_all_allow-isystem-for-headers.diff"
 			qt_assistant_patches="${base_patches}"
 			qt_opengl_patches="${base_patches}"
 			qt_phonon_patches="${base_patches}"
@@ -51,26 +47,26 @@ qt4_qt-copy() {
 			qt_webkit_patches="${base_patches}"
 			qt_xmlpatterns_patches="${base_patches}"
 			qt_script_patches="${base_patches}
-							   0118_all_qtcopy-define.diff
-							   0180_all_window-role-corelib.diff
-							   0209_all_prevent-qt-mixing.diff"
+				0118_all_qtcopy-define.diff
+				0180_all_window-role-corelib.diff
+				0209_all_prevent-qt-mixing.diff"
 			qt_core_patches="${qt_script_patches}
-							0167_all_fix-group-reading.diff"
+				0167_all_fix-group-reading.diff"
 			qt_dbus_patches="${qt_core_patches}"
 			qt_gui_patches="${base_patches}
-							0180_all_window-role-gui.diff
-							0191_all_listview-alternate-row-colors.diff
-							0192_all_itemdelegate-palette-state.diff
-							0195_all_compositing-properties.diff
-							0203_all_qtexthtmlparser-link-color.diff
-							0214_all_fix-qgraphicsproxywidget-tab-crash.diff
-							0220_all_no-x-recursion-in-xerrhandler.diff
-							0223_all_fix-qpixmap-hasalpha.diff
-							0224_all_fast-qpixmap-fill.diff
-							0225_all_invalidate-tabbar-geometry-on-refresh.diff
-							0226_all_qtreeview-column_resize_when_needed.diff"
+				0180_all_window-role-gui.diff
+				0191_all_listview-alternate-row-colors.diff
+				0192_all_itemdelegate-palette-state.diff
+				0195_all_compositing-properties.diff
+				0203_all_qtexthtmlparser-link-color.diff
+				0214_all_fix-qgraphicsproxywidget-tab-crash.diff
+				0220_all_no-x-recursion-in-xerrhandler.diff
+				0223_all_fix-qpixmap-hasalpha.diff
+				0224_all_fast-qpixmap-fill.diff
+				0225_all_invalidate-tabbar-geometry-on-refresh.diff
+				0226_all_qtreeview-column_resize_when_needed.diff"
 			qt_qt3support_patches="${base_patches}
-								   0210_all_fix-crash-q3stylesheet-font-size.diff"
+				0210_all_fix-crash-q3stylesheet-font-size.diff"
 			;;
 		*)
 			eerror "Version ${PVR} is not supported by the qt4-qt-copy eclass!"
@@ -78,14 +74,19 @@ qt4_qt-copy() {
 			;;
 	esac
 
-	mkdir "${S}"/qt-copy
-
+	qt_copy_files=""
 	for qt_copy_patch in ${${PN//-/_}_patches}; do
-		cp "${S}"/patches/${qt_copy_patch} "${S}"/qt-copy/${qt_copy_patch}
+		qt_copy_files="${qt_copy_files} patches/${qt_copy_patch}"
 	done
+	qt_copy_files="${qt_copy_files# }"
+
+	cd "${S}"
+
+	echo "lzma -dc ${DISTDIR}/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma | tar xf - --no-same-owner ${qt_copy_files}"
+	lzma -dc "${DISTDIR}"/qt-copy-${PV}-patches-${QT_COPY_PV}.tar.lzma | tar xf - --no-same-owner ${qt_copy_files}
 
 	EPATCH_MULTI_MSG="Applying QT-copy patches ..." \
-		EPATCH_FORCE="yes" epatch "${S}"/qt-copy
+		EPATCH_FORCE="yes" epatch "${S}"/patches
 }
 
 qt4-qt-copy_src_unpack() {
-- 
2.11.4.GIT