--- ../../../portage/net-irc/quassel/quassel-0.3.0.3.ebuild	2008-10-26 14:22:39.000000000 +0100
+++ quassel-0.3.1.ebuild	2008-11-22 13:35:25.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.0.3.ebuild,v 1.1 2008/10/26 13:22:39 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.10 2008/10/07 20:37:45 jokey Exp $
 
 EAPI=1
 
@@ -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}
 
@@ -55,34 +58,39 @@
 }
 
 src_compile() {
-	local MY_LANGUAGES=""
-	for ling in ${LINGUAS}; do
-		if has $ling ${LANGS}; then
-			MY_LANGUAGES="${ling} ${MY_LANGUAGES}"
-		fi
-	done
-
-	local mycmakeargs="
-		$(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="${MY_LANGUAGES}"
-		-DWANT_MONO=OFF"
+# Comment this out and invoke _common_configure_code, cmake and cmake-utils_src_make
+# manually until cmake-utils.eclass supports space separated strings as arguments for cmake
+# options. Until now multiple languages are not passed to -DLINGUAS and only the first
+# language is considered.
+#
+#	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
+
+	_common_configure_code
+
+	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
+		$(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 \
+		"${S}" || die "Cmake failed"
 
-	cmake-utils_src_compile
+	cmake-utils_src_make
 }
 
 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"