1 |
jokey 08/09/01 18:51:57 |
2 |
|
3 |
Modified: ChangeLog quassel-9999.ebuild |
4 |
Log: |
5 |
Add new useflags and some style improvements to live ebuild, thanks to Daniel Pielmeier for providing the ebuild diff |
6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.28 net-irc/quassel/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.28&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.28&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.27&r2=1.28 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
18 |
retrieving revision 1.27 |
19 |
retrieving revision 1.28 |
20 |
diff -u -r1.27 -r1.28 |
21 |
--- ChangeLog 30 Aug 2008 19:02:53 -0000 1.27 |
22 |
+++ ChangeLog 1 Sep 2008 18:51:57 -0000 1.28 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for net-irc/quassel |
25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.27 2008/08/30 19:02:53 jokey Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.28 2008/09/01 18:51:57 jokey Exp $ |
28 |
+ |
29 |
+ 01 Sep 2008; Markus Ullmann <jokey@g.o> quassel-9999.ebuild: |
30 |
+ Add new useflags and some style improvements to live ebuild, thanks to |
31 |
+ Daniel Pielmeier for providing the ebuild diff |
32 |
|
33 |
*quassel-0.3.0-r1 (30 Aug 2008) |
34 |
*quassel-0.2.0_rc1-r1 (30 Aug 2008) |
35 |
|
36 |
|
37 |
|
38 |
1.8 net-irc/quassel/quassel-9999.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.8&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.8&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.7&r2=1.8 |
43 |
|
44 |
Index: quassel-9999.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v |
47 |
retrieving revision 1.7 |
48 |
retrieving revision 1.8 |
49 |
diff -u -r1.7 -r1.8 |
50 |
--- quassel-9999.ebuild 30 Aug 2008 19:02:53 -0000 1.7 |
51 |
+++ quassel-9999.ebuild 1 Sep 2008 18:51:57 -0000 1.8 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2008 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.7 2008/08/30 19:02:53 jokey Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.8 2008/09/01 18:51:57 jokey Exp $ |
57 |
|
58 |
EAPI=1 |
59 |
|
60 |
@@ -24,20 +24,18 @@ |
61 |
HOMEPAGE="http://quassel-irc.org/" |
62 |
|
63 |
LICENSE="GPL-3" |
64 |
- |
65 |
KEYWORDS="" |
66 |
- |
67 |
SLOT="0" |
68 |
- |
69 |
-IUSE="+X +server debug" |
70 |
+IUSE="+dbus debug +server +ssl +X" |
71 |
|
72 |
RDEPEND="x11-libs/qt-core:4 |
73 |
server? ( |
74 |
x11-libs/qt-sql:4 |
75 |
x11-libs/qt-script:4 |
76 |
) |
77 |
- X? ( x11-libs/qt-gui:4 )" |
78 |
- |
79 |
+ X? ( x11-libs/qt-gui:4 ) |
80 |
+ dbus? ( x11-libs/qt-dbus ) |
81 |
+ ssl? ( dev-libs/openssl )" |
82 |
DEPEND="${RDEPEND} |
83 |
>=dev-util/cmake-2.4.7" |
84 |
|
85 |
@@ -49,16 +47,14 @@ |
86 |
die "Both server and X USE flags unset." |
87 |
fi |
88 |
|
89 |
- qt44=$(has_version x11-libs/qt-sql && echo yes || echo no) |
90 |
- if use server && ! built_with_use $([[ ${qt44} == "yes" ]] && echo "x11-libs/qt-sql sqlite" || echo "x11-libs/qt:4 sqlite3"); then |
91 |
- eerror "Quassel require Qt 4 built with SQLite support" |
92 |
- if [[ ${qt44} == "yes" ]]; then |
93 |
- eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled." |
94 |
- die "Missing sqlite support in x11-libs/qt-sql:4" |
95 |
- else |
96 |
- eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled." |
97 |
- die "Missing sqlite3 support in x11-libs/qt:4" |
98 |
- fi |
99 |
+ if use server && ! built_with_use x11-libs/qt-sql sqlite ; then |
100 |
+ eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled." |
101 |
+ die "Missing sqlite support in x11-libs/qt-sql:4" |
102 |
+ fi |
103 |
+ |
104 |
+ if use ssl && ! built_with_use x11-libs/qt-core ssl ; then |
105 |
+ eerror "Please rebuild x11-libs/qt-core:4 with ssl USE flag enabled." |
106 |
+ die "Missing ssl support in x11-libs/qt-core:4" |
107 |
fi |
108 |
} |
109 |
|
110 |
@@ -66,8 +62,9 @@ |
111 |
local mycmakeargs=" |
112 |
$(cmake-utils_use_want server CORE) |
113 |
$(cmake-utils_use_want X QTCLIENT) |
114 |
- -DWANT_MONO=OFF |
115 |
- " |
116 |
+ $(cmake-utils_use_with dbus DBUS) |
117 |
+ $(cmake-utils_use_with ssl OPENSSL) |
118 |
+ -DWANT_MONO=OFF" |
119 |
|
120 |
cmake-utils_src_compile |
121 |
} |
122 |
@@ -79,12 +76,12 @@ |
123 |
if use X; then |
124 |
insinto /usr/share/icons/hicolor |
125 |
# avoid the connected/ directory, get only the ${size}x${size} |
126 |
- doins -r "${S}"/src/icons/quassel/*x* |
127 |
+ doins -r "${S}"/src/icons/quassel/*x* || die "installing icons failed" |
128 |
fi |
129 |
|
130 |
if use server; then |
131 |
- newinitd "${FILESDIR}"/quasselcore.init quasselcore |
132 |
- newconfd "${FILESDIR}"/quasselcore.conf quasselcore |
133 |
+ newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed" |
134 |
+ newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed" |
135 |
fi |
136 |
} |