diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-04-05 17:07:53 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-04-05 17:07:53 +0000 |
commit | 652d2dee1230799806932396ba85e9813062e47d (patch) | |
tree | 89d5fb7033b690cae4aff2f1d6044b1861e2bd05 /net-irc | |
parent | added missing diff, bug 216336; thanks to D.Liana for reporting this (diff) | |
download | gentoo-2-652d2dee1230799806932396ba85e9813062e47d.tar.gz gentoo-2-652d2dee1230799806932396ba85e9813062e47d.tar.bz2 gentoo-2-652d2dee1230799806932396ba85e9813062e47d.zip |
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.
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/quassel/ChangeLog | 10 | ||||
-rw-r--r-- | net-irc/quassel/quassel-0.2.0_alpha4.ebuild | 15 | ||||
-rw-r--r-- | net-irc/quassel/quassel-9999.ebuild | 78 |
3 files changed, 97 insertions, 6 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/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" +} |