--- /usr/local/portage/petr_p/sci-geosciences/qgis/qgis-1.0.1.ebuild	2009-06-04 14:23:26.000000000 +0200
+++ /usr/local/portage/petr_p/sci-geosciences/qgis/qgis-1.0.1.ebuild	2009-06-25 12:47:45.000000000 +0200
@@ -2,6 +2,8 @@ 
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit cmake-utils eutils qt4 autotools
 
 DESCRIPTION="Quantum GIS (QGIS) is a Geographic Information System (GIS)"
@@ -15,7 +17,10 @@ 
 IUSE="debug gps grass gsl postgres python samples"
 
 DEPEND=">=sci-libs/gdal-1.3.1
-		x11-libs/qt:4
+		x11-libs/qt-core:4[qt3support]
+		x11-libs/qt-gui:4
+		x11-libs/qt-svg:4
+		x11-libs/qt-sql:4
 		dev-db/sqlite:3
 		sci-libs/geos
 		sci-libs/proj
@@ -37,21 +42,12 @@ 
 
 S=${WORKDIR}/${PN}_${PV}
 
-pkg_setup() {
-	if ! built_with_use x11-libs/qt qt3support; then
-		eerror "QGIS needs Qt4 with qt3support. Please recompile qt:"
-		eerror "echo \"=x11-libs/qt-4* qt3support\" >> /etc/portage/package.use"
-		eerror "emerge -av1 qt"
-		die "Qt4 not compiled with 'qt3support'!"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 }
 
-src_compile() {
+src_configure() {
 	local mycmakeargs
 	mycmakeargs="${mycmakeargs} -DBUILD_SHARED_LIBS:BOOL=ON \
 		$(cmake-utils_use_with postgres POSTGRESQL) \
@@ -70,7 +66,7 @@ 
 		mycmakeargs="${mycmakeargs} -DGRASS_PREFIX=${GRASSPATH}"
 	fi
 
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 }
 
 src_install() {