Fix build issues in live. Basic ebuild from patrick, i am proxying because he cant test.

(Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 64 insertions, 50 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index f3527aef22e1..46a4ac9b1411 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/quassel
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.38 2008/11/29 17:58:44 darkside Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.39 2009/01/03 21:24:31 scarabeus Exp $
+
+  03 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  quassel-9999.ebuild:
+  Fix build issues in live. Basic ebuild from patrick, i am proxying because
+  he cant test.
 
   29 Nov 2008; Jeremy Olexa <darkside@gentoo.org> metadata.xml:
   patrick will be the sole proxy committer now, removing myself from metadata
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index bedb064f9796..c7307ee2d51f 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -15,12 +15,20 @@
       disabled, the GUI is not built, and cannot be used. You might
       want to disable this on the server, but you need it enabled on
       the client.
-    </flag>
+	</flag>
+	<flag name="phonon">
+	  Build client with phonon backend support. This enables sound
+	  playback in client.
+	</flag>
     <flag name="server">
       Build the server binary. If this USE flag is disabled, the
       'core' server binary for quassel is not built, and cannot be
       used. You need this enabled on the server, but you might want to
       disable it on the client.
-    </flag>
+	</flag>
+	<flag name="webkit">
+	  Use qt-webkit rendering engine for showing url thumbmails and
+	  for other things that needs webbrowser intergration.
+	</flag>
   </use>
 </pkgmetadata>
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 350673a42a1b..2957d46de254 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.11 2008/11/25 00:24:42 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.12 2009/01/03 21:24:31 scarabeus Exp $
 
-EAPI=1
+EAPI="2"
 
 inherit cmake-utils eutils git
 
@@ -15,24 +15,31 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="+dbus debug +server +ssl +X"
+IUSE="dbus debug kde phonon +server +ssl webkit +X"
 
-LANGS="nb_NO da de fr ru"
+LANGS="cs da de fr nb_NO ru tr"
 for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
 
-RDEPEND="x11-libs/qt-core:4
-		server? (
-			x11-libs/qt-sql:4
-			x11-libs/qt-script:4
-		)
-		X? (
-			x11-libs/qt-gui:4
-			x11-libs/qt-webkit:4
-		)
-		dbus? ( x11-libs/qt-dbus:4 )
-		ssl? ( dev-libs/openssl )"
+RDEPEND="
+	x11-libs/qt-core:4
+	dbus? ( x11-libs/qt-dbus:4 )
+	server? (
+		x11-libs/qt-sql:4[sqlite]
+		x11-libs/qt-script:4
+	)
+	ssl? (
+		dev-libs/openssl
+		x11-libs/qt-core:4[ssl]
+	)
+	X? (
+		x11-libs/qt-gui:4
+		kde? ( >=kde-base/kdelibs-4.1 )
+		phonon? ( || ( media-sound/phonon x11-libs/qt-phonon ) )
+		webkit? ( x11-libs/qt-webkit:4 )
+	)
+	"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.6"
 
@@ -43,47 +50,41 @@ pkg_setup() {
 		eerror "You have to build one or both of quassel client or server."
 		die "Both server and X USE flags unset."
 	fi
-
-	if use server && ! built_with_use x11-libs/qt-sql sqlite ; then
-		eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
-		die "Missing sqlite support in x11-libs/qt-sql:4"
-	fi
-
-	if use ssl && ! built_with_use x11-libs/qt-core ssl ; then
-		eerror "Please rebuild x11-libs/qt-core:4 with ssl USE flag enabled."
-		die "Missing ssl support in x11-libs/qt-core:4"
-	fi
 }
 
-src_compile() {
-# Comment this out and invoke _common_configure_code, cmake and cmake-utils_src_make
+src_configure() {
+# 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
+	local mycmakeargs="$(cmake-utils_use_want server CORE)
+		$(cmake-utils_use_want X QTCLIENT)
+		$(cmake-utils_use_with webkit WEBKIT)
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use_with kde KDE)
+		$(cmake-utils_use_with phonon PHONON)
+		$(cmake-utils_use_with ssl OPENSSL)"
+
+	if use kde ; then
+		# We don't use our own phonon backend, so don't enable it; also use system icon themes
+		mycmakeargs="${mycmakeargs} -DWITH_PHONON=0 -DOXYGEN_ICONS=External -DQUASSEL_ICONS=External"
+	else
+		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)
+			-DOXYGEN_ICONS=Builtin -DQUASSEL_ICONS=Builtin"
+	fi
+
 
 	_common_configure_code
 
+	mkdir -p "${WORKDIR}"/${PN}_build
+	pushd "${WORKDIR}"/${PN}_build > /dev/null
+
 	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 \
+		${mycmakeargs} \
+		-DLINGUAS="${LINGUAS}" \
+		-DCMAKE_INSTALL_DO_STRIP=OFF \
 		"${S}" || die "Cmake failed"
 
-	cmake-utils_src_make
 }
 
 src_install() {