Avoid parallel make as per bug #216101 in alpha4, and add a live SVN ebuild as was requested a couple of times (again, I prefer it here rather than in a number of unofficial overlays breaking it.

Package-Manager: portage-2.1.4.4

4 files changed, 103 insertions, 11 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 5022a4f71829..b14fd4b8c491 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2008/04/01 11:37:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.10 2008/04/05 17:07:53 flameeyes Exp $
+
+*quassel-9999 (05 Apr 2008)
+
+  05 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  quassel-0.2.0_alpha4.ebuild, +quassel-9999.ebuild:
+  Avoid parallel make as per bug #216101 in alpha4, and add a live SVN
+  ebuild as was requested a couple of times (again, I prefer it here rather
+  than in a number of unofficial overlays breaking it.
 
 *quassel-0.2.0_alpha4 (01 Apr 2008)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 7444bf2c0fb6..5e8b7c601599 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA1
 
 DIST quassel-0.2.0-alpha4.tar.bz2 928137 RMD160 c35f3fcebf129a3cc49896ddb58b2adb5f821876 SHA1 b434aede94fac7977a59bd4f5fad61bc1addb1d2 SHA256 ccd34f22bcbaa87123cfaa3a6da9765500a13eff3020b5c55239ba5dcec1f4a6
-EBUILD quassel-0.2.0_alpha4.ebuild 1930 RMD160 44ad5c590378207d734c70dd41d29fae2caa1e71 SHA1 d9a868cdfc8acdce32b752054b7af2d80562ef98 SHA256 9afe2f9120f4c42bc6b8be90667673666f7503ef391fa1288e0407fda951fdb9
-MISC ChangeLog 1650 RMD160 35060a494787cabb8c55174be2e33215b07347bf SHA1 c9c796ca647770c04bc35a859be0f90c0d87a13e SHA256 35d760e4385d84ef5472c5de4012d84d45673a8f23178cc07c724dbac8eefebd
+EBUILD quassel-0.2.0_alpha4.ebuild 2044 RMD160 6fe14296e4649bdbac1557b2a1a369fab8898970 SHA1 2609c5e36eff5b3ba4ac664997985cc5846e434b SHA256 c3666b1883993e7942edca2fa91c7d5bdb50cf3e7ec635fa1b04c557a944a597
+EBUILD quassel-9999.ebuild 2021 RMD160 823e7f9e64a906963b3868881ebebc23f67f18b6 SHA1 a1ed1a01e5e9aee2d65594b01282945d37ac152f SHA256 af243b17ecc519bbac089c8209bb255c4e49b14647d6b383ef64c20e7708d53c
+MISC ChangeLog 1989 RMD160 8e05f6b1864a2a806fdc862ede1eaa906347787b SHA1 ecc6fd11cb3b079ef1a0a314cc671e539f0fe6f6 SHA256 c04b5bf631cddb5fa6f785f41b8336ba65c67dbd43ba2f6c5a4501ae08055949
 MISC metadata.xml 774 RMD160 010aec105a64c3df2588c730d486141c8a012fde SHA1 4ffb676c8c4fb09165ddb5b4290fc45cc669ceff SHA256 3dc9c83a72739921a5c7197db9f634cfe84dfd49f12fd4804252e3c583ecf799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfyHn8ACgkQAiZjviIA2XjxTACg0VZsEmi6GR+GpQXxMtUdMbcg
-RaEAnAyFK8T7DKf+w12qbiHICrtN79yU
-=VvZv
+iEYEARECAAYFAkf3se8ACgkQAiZjviIA2Xgt9QCfdwEyRhn95ajegOxAeIIJ8XHI
+91IAn1OzTHhTtHd4q1aHuP7cPJOakSI2
+=eaUe
 -----END PGP SIGNATURE-----
diff --git a/net-irc/quassel/quassel-0.2.0_alpha4.ebuild b/net-irc/quassel/quassel-0.2.0_alpha4.ebuild
index 92f76e329d7c..e46a488c6920 100644
--- a/net-irc/quassel/quassel-0.2.0_alpha4.ebuild
+++ b/net-irc/quassel/quassel-0.2.0_alpha4.ebuild
@@ -1,17 +1,22 @@
 # 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.2.0_alpha4.ebuild,v 1.1 2008/04/01 11:37:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_alpha4.ebuild,v 1.2 2008/04/05 17:07:53 flameeyes Exp $
 
 EAPI=1
 
 inherit qt4
 
-MY_P="${P/_alpha/-alpha}"
-S=${WORKDIR}/${MY_P}
+if [[ ${PV} == 9999 ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://svn.quassel-irc.org/trunk"
+else
+	MY_P="${P/_alpha/-alpha}"
+	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
+fi
 
 DESCRIPTION="Core/client IRC client."
 HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 
@@ -59,7 +64,7 @@ src_compile() {
 	use X && BUILD="${BUILD} qtclient"
 
 	eqmake4 ${PN}.pro BUILD="${BUILD}" || die "eqmake4 failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
new file mode 100644
index 000000000000..6deac2d9d147
--- /dev/null
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -0,0 +1,78 @@
+# 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.1 2008/04/05 17:07:53 flameeyes Exp $
+
+EAPI=1
+
+inherit qt4
+
+if [[ ${PV} == 9999 ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://svn.quassel-irc.org/trunk"
+else
+	MY_P="${P/_alpha/-alpha}"
+	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Core/client IRC client."
+HOMEPAGE="http://quassel-irc.org/"
+
+LICENSE="GPL-3"
+
+KEYWORDS=""
+
+SLOT="0"
+
+IUSE="+X +server debug"
+
+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-4.3*:4
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if ! use server && ! use X; then
+		eerror "You have to build one or both of quassel client or server."
+		die "Both server and X USE flags unset."
+	fi
+
+	qt44=$(has_version x11-libs/qt-sql && echo yes || echo no)
+	if use server && ! built_with_use $([[ ${qt44} == "yes" ]] && echo "x11-libs/qt-sql sqlite" || echo "x11-libs/qt:4 sqlite3"); then
+		eerror "Quassel require Qt 4 built with SQLite support"
+		if [[ ${qt44} == "yes" ]]; then
+			eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
+			die "Missing sqlite support in x11-libs/qt-sql:4"
+		else
+			eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled."
+			die "Missing sqlite3 support in x11-libs/qt:4"
+		fi
+	fi
+}
+
+src_compile() {
+	local BUILD=""
+	use server && BUILD="${BUILD} core"
+	use X && BUILD="${BUILD} qtclient"
+
+	eqmake4 ${PN}.pro BUILD="${BUILD}" || die "eqmake4 failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	local targets=""
+	use server && targets="${targets} build/targets/quasselcore"
+	use X && targets="${targets} build/targets/quasselclient"
+	dobin $targets  || die "quasselcore install failed"
+
+	dodoc ChangeLog README README.Qtopia dev-notes/paulk-notes.txt \
+		dev-notes/ROADMAP || die "dodoc failed"
+}