--- quassel-0.3.0.3.ebuild	2008-11-25 01:38:09.000000000 +0100
+++ quassel-0.3.1.ebuild	2008-11-25 20:20:31.000000000 +0100
@@ -13,11 +13,11 @@
 SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~x86"
 SLOT="0"
 IUSE="+dbus debug +server +ssl +X"
 
-LANGS="nb_NO da de fr"
+LANGS="nb_NO da de fr ru"
 for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
@@ -27,13 +27,16 @@
 			x11-libs/qt-sql:4
 			x11-libs/qt-script:4
 		)
-		X? ( x11-libs/qt-gui:4 )
-		dbus? ( x11-libs/qt-dbus )
+		X? (
+			x11-libs/qt-gui:4
+			x11-libs/qt-webkit:4
+		)
+		dbus? ( x11-libs/qt-dbus:4 )
 		ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
+	>=dev-util/cmake-2.6"
 
-DOCS="AUTHORS ChangeLog README README.Qtopia"
+DOCS="AUTHORS ChangeLog README"
 
 S=${WORKDIR}/${MY_P}
 
@@ -63,9 +66,12 @@
 #	local mycmakeargs=(
 #		"$(cmake-utils_use_want server CORE)"
 #		"$(cmake-utils_use_want X QTCLIENT)"
+#		"$(cmake-utils_use_with X WEBKIT)"
 #		"$(cmake-utils_use_with dbus DBUS)"
 #		"$(cmake-utils_use_with ssl OPENSSL)"
 #		"-DLINGUAS=\"${LINGUAS}\""
+#		'-DOXYGEN_ICONS=Builtin'
+#		'-DQUASSEL_ICONS=Builtin'
 #		'-DWANT_MONO=OFF' )
 #
 #	cmake-utils_src_compile
@@ -74,8 +80,9 @@
 
 	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
 		$(cmake-utils_use_want server CORE) $(cmake-utils_use_want X QTCLIENT) \
-		$(cmake-utils_use_with dbus DBUS) $(cmake-utils_use_with ssl OPENSSL) \
-		-DLINGUAS="${LINGUAS}" -DWANT_MONO=OFF \
+		$(cmake-utils_use_with X WEBKIT) $(cmake-utils_use_with dbus DBUS) \
+		$(cmake-utils_use_with ssl OPENSSL) -DLINGUAS="${LINGUAS}" \
+		-DOXYGEN_ICONS=Builtin -DQUASSEL_ICONS=Builtin -DWANT_MONO=OFF \
 		"${S}" || die "Cmake failed"
 
 	cmake-utils_src_make
@@ -84,13 +91,6 @@
 src_install() {
 	cmake-utils_src_install
 
-	# Only install the icons if the X client was installed
-	if use X ; then
-		insinto /usr/share/icons/hicolor
-		# avoid the connected/ directory, get only the ${size}x${size}
-		doins -r "${S}"/src/icons/quassel/*x* || die "installing quassel icons failed"
-	fi
-
 	if use server ; then
 		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"