New revision of the live ebuild. Upstream switched to cmake, so let's follow with the ebuild too.

Package-Manager: portage-2.1.5.5

3 files changed, 36 insertions, 24 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 123f85454e8a..c62741701154 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,13 @@
 # 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.15 2008/06/03 15:04:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.16 2008/06/16 16:19:11 flameeyes Exp $
+
+*quassel-9999-r1 (16 Jun 2008)
+
+  16 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> -quassel-9999.ebuild,
+  +quassel-9999-r1.ebuild:
+  New revision of the live ebuild. Upstream switched to cmake, so let's
+  follow with the ebuild too.
 
   03 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> quassel-9999.ebuild:
   Update live ebuild to use GIT rather than Subversion, as upstream switched
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 12055ef686ef..817fc7a37301 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 DIST quassel-0.2.0-beta1.tar.bz2 967029 RMD160 8ae5af27714b60f38b123f6b0bbef9da4c8b1ffe SHA1 36fe1f1352f79f77d824d076add4e9e24c49ba75 SHA256 b57e9736e40f43233902b8903ed9681fda2deadf9a3e31a75d3a7726b0c784ef
 EBUILD quassel-0.2.0_beta1.ebuild 2225 RMD160 a5e6fc160138f5fa18cf5c9508772d1b3af8d4d0 SHA1 8cdc8d0e9f38213e2501c3caa94db9d79e172c48 SHA256 c6877e7aedebdaed044566df5cfb6c348e01ab4d9c6b5ec0a5d03d7944a4100c
-EBUILD quassel-9999.ebuild 2205 RMD160 cd78ee8d6d82179d585ce7ad6b5351870b0170a8 SHA1 c3e8f8caeda79e15b5533a5ad9c29f67d8afb17f SHA256 113fbe72ad208bc8ef12fa8ccf4982fae3ba92c210d9899049704e265d48e0c9
-MISC ChangeLog 2882 RMD160 0e5734b4c73d2cf3b8c0a32007d15244d5148be1 SHA1 390c3eb78d5790aca8e934b3c7464209483ec4dc SHA256 d54d65b78e450286c6079ae18f25542c61625b83e0643b04193c922e9996649f
+EBUILD quassel-9999-r1.ebuild 2096 RMD160 afcaee215918ed939579e3ab6edea505edb9a9e1 SHA1 28eebf0ceb25b9219c21c71c72bc71d18a291a06 SHA256 12cfb4de3e2bd1d45f2486f195eb8ad9a9ce76be501204ad284cc4906586d4ea
+MISC ChangeLog 3119 RMD160 b505906e59f842b38f6355dbac977bf89e4588f6 SHA1 5ac3a32c5dbc42600543439921ed0388ccd02cc8 SHA256 2c912cd68f9e2e7265a8ec9355560bdbd2d11685033040fca01385ec1218038d
 MISC metadata.xml 774 RMD160 010aec105a64c3df2588c730d486141c8a012fde SHA1 4ffb676c8c4fb09165ddb5b4290fc45cc669ceff SHA256 3dc9c83a72739921a5c7197db9f634cfe84dfd49f12fd4804252e3c583ecf799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhFXXEACgkQAiZjviIA2XjDRgCgt8kNyxl2QDoFcosigf4rDcbA
-W7EAn2dQFJxmDaO3hatfjXdJWv2KWAVg
-=JyUO
+iEYEARECAAYFAkhWkoYACgkQAiZjviIA2XiXNACbBUF9Z00xNA6/7UwadzTn8pMN
+OXkAoJ4IiL/WfWeXn8/E/4GRCCqJWNrg
+=QCh4
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999-r1.ebuild
index d560c214089e..d44bc3e03dbf 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999-r1.ebuild
@@ -1,14 +1,19 @@
 # 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-9999.ebuild,v 1.5 2008/06/03 15:04:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild,v 1.1 2008/06/16 16:19:11 flameeyes Exp $
 
 EAPI=1
 
-inherit qt4
+inherit cmake-utils
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
+
+	case ${PV} in
+		0.2.9999) EGIT_BRANCH="0.2" ;;
+		*) EGIT_BRANCH="master"
+	esac
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -39,6 +44,8 @@ RDEPEND="|| (
 	)"
 DEPEND="${RDEPEND}"
 
+DOCS="ChangeLog README README.Qtopia"
+
 pkg_setup() {
 	if ! use server && ! use X; then
 		eerror "You have to build one or both of quassel client or server."
@@ -59,26 +66,24 @@ pkg_setup() {
 }
 
 src_compile() {
-	local BUILD=""
-	use server && BUILD="${BUILD} core"
-	use X && BUILD="${BUILD} qtclient"
+	local mycmakeargs="
+		$(cmake-utils_use_want server CORE)
+		$(cmake-utils_use_want X QTCLIENT)
+		-DWANT_MONO=OFF
+		"
 
-	eqmake4 ${PN}.pro BUILD="${BUILD}" || die "eqmake4 failed"
-	emake || die "emake failed"
+	cmake-utils_src_compile
 }
 
 src_install() {
-	local targets=""
-	use server && targets="${targets} build/targets/quasselcore"
-	use X && targets="${targets} build/targets/quasselclient"
-	dobin $targets  || die "quasselcore install failed"
+	cmake-utils_src_install
 
-	# Only install the desktop file if the X client was installed
+	# Only install the icons if the X client was installed
 	if use X; then
-		sed -i -e 's:Exec=quassel:Exec=quasselclient:' ${PN}.desktop \
-			|| die "failed to fix desktop file"
-		domenu ${PN}.desktop || die "desktop file install failed"
+		local size
+		for size in 16 24 32 48 64 96 128 256 512; do
+			insinto /usr/share/icons/hicolor/${size}x${size}
+			newins "${S}"/src/icons/quassel/connected/${size}.png quassel.png
+		done
 	fi
-
-	dodoc ChangeLog README README.Qtopia || "dodoc failed"
 }