Installation path adjustments and empty dir cleanup of qt recipe

dev-qt/qtcore/qtcore-4.8.5.git.recipe

@@ -12,7 +12,7 @@ HOMEPAGE="http://qt-haiku.ru"
 SRC_URI="git://gitorious.org/+qt-haiku/qt/qt-haiku-port.git"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2011 Nokia Corporation and/or its subsidiary(-ies)."
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
     # x86_gcc2 is fine as primary target architecture as long as we're building
@@ -125,6 +125,8 @@ PROVIDES_devel="
 
 REQUIRES_devel="
 	qtcore$secondaryArchSuffix == $portVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
 	"
 
 PATCHES="qtcore-4.8.5.git.patchset"
@@ -138,11 +140,11 @@ BUILD()
 		-headerdir $includeDir \
 		-docdir $docDir/Qt \
 		-datadir $dataDir/Qt \
-		-translationdir $dataDir/Qt \
+		-translationdir $dataDir/Qt/translations \
 		-sysconfdir $settingsDir \
-		-demosdir $dataDir/Qt \
-		-examplesdir $dataDir/Qt \
-		-importdir $dataDir/Qt \
+		-demosdir $dataDir/Qt/demos \
+		-examplesdir $dataDir/Qt/examples \
+		-importdir $dataDir/Qt/imports \
 		-plugindir $addOnsDir/Qt \
 		-no-pch -no-opengl -no-largefile \
 		-fast -nomake examples -nomake demos -release -opensource \
@@ -198,8 +200,10 @@ INSTALL()
 	done
 
 	packageEntries devel $developDir \
-		$devPackageCommands
+		$devPackageCommands \
+		$dataDir/Qt/mkspecs
 
 	# move tests to demo/example package when it exists
 	rm -rf $prefix/tests
+	rm -rf $dataDir/Qt/demos $dataDir/Qt/examples
 }