| 1 |
flameeyes 08/04/05 17:07:53 |
| 2 |
|
| 3 |
Modified: quassel-0.2.0_alpha4.ebuild ChangeLog |
| 4 |
Added: quassel-9999.ebuild |
| 5 |
Log: |
| 6 |
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. |
| 7 |
(Portage version: 2.1.4.4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-irc/quassel/quassel-0.2.0_alpha4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.0_alpha4.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.0_alpha4.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-0.2.0_alpha4.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: quassel-0.2.0_alpha4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_alpha4.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- quassel-0.2.0_alpha4.ebuild 1 Apr 2008 11:37:17 -0000 1.1 |
| 23 |
+++ quassel-0.2.0_alpha4.ebuild 5 Apr 2008 17:07:53 -0000 1.2 |
| 24 |
@@ -1,17 +1,22 @@ |
| 25 |
# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=1 |
| 31 |
|
| 32 |
inherit qt4 |
| 33 |
|
| 34 |
-MY_P="${P/_alpha/-alpha}" |
| 35 |
-S=${WORKDIR}/${MY_P} |
| 36 |
+if [[ ${PV} == 9999 ]]; then |
| 37 |
+ inherit subversion |
| 38 |
+ ESVN_REPO_URI="http://svn.quassel-irc.org/trunk" |
| 39 |
+else |
| 40 |
+ MY_P="${P/_alpha/-alpha}" |
| 41 |
+ SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2" |
| 42 |
+ S=${WORKDIR}/${MY_P} |
| 43 |
+fi |
| 44 |
|
| 45 |
DESCRIPTION="Core/client IRC client." |
| 46 |
HOMEPAGE="http://quassel-irc.org/" |
| 47 |
-SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2" |
| 48 |
|
| 49 |
LICENSE="GPL-3" |
| 50 |
|
| 51 |
@@ -59,7 +64,7 @@ |
| 52 |
use X && BUILD="${BUILD} qtclient" |
| 53 |
|
| 54 |
eqmake4 ${PN}.pro BUILD="${BUILD}" || die "eqmake4 failed" |
| 55 |
- emake || die "emake failed" |
| 56 |
+ emake -j1 || die "emake failed" |
| 57 |
} |
| 58 |
|
| 59 |
src_install() { |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.10 net-irc/quassel/ChangeLog |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.10&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.10&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.9&r2=1.10 |
| 68 |
|
| 69 |
Index: ChangeLog |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
| 72 |
retrieving revision 1.9 |
| 73 |
retrieving revision 1.10 |
| 74 |
diff -u -r1.9 -r1.10 |
| 75 |
--- ChangeLog 1 Apr 2008 11:37:17 -0000 1.9 |
| 76 |
+++ ChangeLog 5 Apr 2008 17:07:53 -0000 1.10 |
| 77 |
@@ -1,6 +1,14 @@ |
| 78 |
# ChangeLog for net-irc/quassel |
| 79 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.9 2008/04/01 11:37:17 flameeyes Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.10 2008/04/05 17:07:53 flameeyes Exp $ |
| 82 |
+ |
| 83 |
+*quassel-9999 (05 Apr 2008) |
| 84 |
+ |
| 85 |
+ 05 Apr 2008; Diego Pettenò <flameeyes@g.o> |
| 86 |
+ quassel-0.2.0_alpha4.ebuild, +quassel-9999.ebuild: |
| 87 |
+ Avoid parallel make as per bug #216101 in alpha4, and add a live SVN |
| 88 |
+ ebuild as was requested a couple of times (again, I prefer it here rather |
| 89 |
+ than in a number of unofficial overlays breaking it. |
| 90 |
|
| 91 |
*quassel-0.2.0_alpha4 (01 Apr 2008) |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.1 net-irc/quassel/quassel-9999.ebuild |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.1&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.1&content-type=text/plain |
| 100 |
|
| 101 |
Index: quassel-9999.ebuild |
| 102 |
=================================================================== |
| 103 |
# Copyright 1999-2008 Gentoo Foundation |
| 104 |
# Distributed under the terms of the GNU General Public License v2 |
| 105 |
# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.1 2008/04/05 17:07:53 flameeyes Exp $ |
| 106 |
|
| 107 |
EAPI=1 |
| 108 |
|
| 109 |
inherit qt4 |
| 110 |
|
| 111 |
if [[ ${PV} == 9999 ]]; then |
| 112 |
inherit subversion |
| 113 |
ESVN_REPO_URI="http://svn.quassel-irc.org/trunk" |
| 114 |
else |
| 115 |
MY_P="${P/_alpha/-alpha}" |
| 116 |
SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2" |
| 117 |
S=${WORKDIR}/${MY_P} |
| 118 |
fi |
| 119 |
|
| 120 |
DESCRIPTION="Core/client IRC client." |
| 121 |
HOMEPAGE="http://quassel-irc.org/" |
| 122 |
|
| 123 |
LICENSE="GPL-3" |
| 124 |
|
| 125 |
KEYWORDS="" |
| 126 |
|
| 127 |
SLOT="0" |
| 128 |
|
| 129 |
IUSE="+X +server debug" |
| 130 |
|
| 131 |
RDEPEND="|| ( |
| 132 |
( |
| 133 |
x11-libs/qt-core:4 |
| 134 |
server? ( |
| 135 |
x11-libs/qt-sql:4 |
| 136 |
x11-libs/qt-script:4 |
| 137 |
) |
| 138 |
X? ( x11-libs/qt-gui:4 ) |
| 139 |
) |
| 140 |
=x11-libs/qt-4.3*:4 |
| 141 |
)" |
| 142 |
DEPEND="${RDEPEND}" |
| 143 |
|
| 144 |
pkg_setup() { |
| 145 |
if ! use server && ! use X; then |
| 146 |
eerror "You have to build one or both of quassel client or server." |
| 147 |
die "Both server and X USE flags unset." |
| 148 |
fi |
| 149 |
|
| 150 |
qt44=$(has_version x11-libs/qt-sql && echo yes || echo no) |
| 151 |
if use server && ! built_with_use $([[ ${qt44} == "yes" ]] && echo "x11-libs/qt-sql sqlite" || echo "x11-libs/qt:4 sqlite3"); then |
| 152 |
eerror "Quassel require Qt 4 built with SQLite support" |
| 153 |
if [[ ${qt44} == "yes" ]]; then |
| 154 |
eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled." |
| 155 |
die "Missing sqlite support in x11-libs/qt-sql:4" |
| 156 |
else |
| 157 |
eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled." |
| 158 |
die "Missing sqlite3 support in x11-libs/qt:4" |
| 159 |
fi |
| 160 |
fi |
| 161 |
} |
| 162 |
|
| 163 |
src_compile() { |
| 164 |
local BUILD="" |
| 165 |
use server && BUILD="${BUILD} core" |
| 166 |
use X && BUILD="${BUILD} qtclient" |
| 167 |
|
| 168 |
eqmake4 ${PN}.pro BUILD="${BUILD}" || die "eqmake4 failed" |
| 169 |
emake || die "emake failed" |
| 170 |
} |
| 171 |
|
| 172 |
src_install() { |
| 173 |
local targets="" |
| 174 |
use server && targets="${targets} build/targets/quasselcore" |
| 175 |
use X && targets="${targets} build/targets/quasselclient" |
| 176 |
dobin $targets || die "quasselcore install failed" |
| 177 |
|
| 178 |
dodoc ChangeLog README README.Qtopia dev-notes/paulk-notes.txt \ |
| 179 |
dev-notes/ROADMAP || die "dodoc failed" |
| 180 |
} |
| 181 |
|
| 182 |
|
| 183 |
|
| 184 |
-- |
| 185 |
gentoo-commits@l.g.o mailing list |
Archives