1 |
scarabeus 10/07/01 10:34:03 |
2 |
|
3 |
Modified: ChangeLog quassel-9999.ebuild |
4 |
Log: |
5 |
Redo the live ebuild quite bit. Do not die in pkg_setup. Move confighome to system location. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.89 net-irc/quassel/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.89&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?rev=1.89&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/ChangeLog?r1=1.88&r2=1.89 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v |
18 |
retrieving revision 1.88 |
19 |
retrieving revision 1.89 |
20 |
diff -u -r1.88 -r1.89 |
21 |
--- ChangeLog 17 Jun 2010 20:48:46 -0000 1.88 |
22 |
+++ ChangeLog 1 Jul 2010 10:34:03 -0000 1.89 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for net-irc/quassel |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.88 2010/06/17 20:48:46 patrick Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.89 2010/07/01 10:34:03 scarabeus Exp $ |
28 |
+ |
29 |
+ 01 Jul 2010; Tomáš Chvátal <scarabeus@g.o> quassel-9999.ebuild, |
30 |
+ +files/quasselcore.conf, +files/quasselcore.init: |
31 |
+ Redo the live ebuild quite bit. Do not die in pkg_setup. Move confighome |
32 |
+ to system location. |
33 |
|
34 |
17 Jun 2010; Patrick Lauer <patrick@g.o> quassel-0.5.1.ebuild, |
35 |
quassel-0.5.2.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.36 net-irc/quassel/quassel-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.36&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?rev=1.36&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/quassel/quassel-9999.ebuild?r1=1.35&r2=1.36 |
44 |
|
45 |
Index: quassel-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v |
48 |
retrieving revision 1.35 |
49 |
retrieving revision 1.36 |
50 |
diff -u -r1.35 -r1.36 |
51 |
--- quassel-9999.ebuild 7 Jun 2010 16:33:42 -0000 1.35 |
52 |
+++ quassel-9999.ebuild 1 Jul 2010 10:34:03 -0000 1.36 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.35 2010/06/07 16:33:42 billie Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.36 2010/07/01 10:34:03 scarabeus Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
@@ -46,6 +46,14 @@ |
62 |
X? ( ${GUI_RDEPEND} ) |
63 |
) |
64 |
ssl? ( x11-libs/qt-core:4[ssl] ) |
65 |
+ !monolithic? ( |
66 |
+ !server? ( |
67 |
+ !X? ( |
68 |
+ ${SERVER_RDEPEND} |
69 |
+ ${GUI_RDEPEND} |
70 |
+ ) |
71 |
+ ) |
72 |
+ ) |
73 |
" |
74 |
DEPEND="${RDEPEND}" |
75 |
|
76 |
@@ -53,14 +61,16 @@ |
77 |
|
78 |
pkg_setup() { |
79 |
if ! use monolithic && ! use server && ! use X ; then |
80 |
- eerror "You have to build at least one of the monolithic client (USE=monolithic)," |
81 |
- eerror "the quasselclient (USE=X) or the quasselcore (USE=server)." |
82 |
- die "monolithic, server and X flag unset." |
83 |
+ ewarn "You have to build at least one of the monolithic client (USE=monolithic)," |
84 |
+ ewarn "the quasselclient (USE=X) or the quasselcore (USE=server)." |
85 |
+ echo |
86 |
+ ewarn "Enabling monolithic by default." |
87 |
+ FORCED_MONO="yes" |
88 |
fi |
89 |
} |
90 |
|
91 |
src_configure() { |
92 |
- local mycmakeargs=" |
93 |
+ local mycmakeargs=( |
94 |
$(cmake-utils_use_with ayatana LIBINDICATE) |
95 |
$(cmake-utils_use_want X QTCLIENT) |
96 |
$(cmake-utils_use_want server CORE) |
97 |
@@ -71,8 +81,10 @@ |
98 |
$(cmake-utils_use_with dbus) |
99 |
$(cmake-utils_use_with ssl OPENSSL) |
100 |
$(cmake-utils_use_with !kde OXYGEN) |
101 |
- -DEMBED_DATA=OFF |
102 |
- " |
103 |
+ "-DEMBED_DATA=OFF" |
104 |
+ ) |
105 |
+ |
106 |
+ [[ ${FORCED_MONO} == "yes" ]] && mycmakeargs+=( '-DWANT_MONO=ON' ) |
107 |
|
108 |
cmake-utils_src_configure |
109 |
} |
110 |
@@ -81,26 +93,47 @@ |
111 |
cmake-utils_src_install |
112 |
|
113 |
if use server ; then |
114 |
- newinitd "${FILESDIR}"/quasselcore-2.init quasselcore || die "newinitd failed" |
115 |
- newconfd "${FILESDIR}"/quasselcore-2.conf quasselcore || die "newconfd failed" |
116 |
+ # prepare folders in /var/ |
117 |
+ dodir /var/lib/${PN}/ |
118 |
+ keepdir /var/lib/${PN}/ |
119 |
+ fowners ${PN}:${PN} /var/lib/${PN}/ |
120 |
+ |
121 |
+ # init scripts |
122 |
+ newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed" |
123 |
+ newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed" |
124 |
|
125 |
+ # logrotate |
126 |
insinto /etc/logrotate.d |
127 |
- newins "${FILESDIR}/quassel.logrotate" quassel |
128 |
+ newins "${FILESDIR}/quassel.logrotate" quassel || die "newins failed" |
129 |
fi |
130 |
} |
131 |
|
132 |
+pkg_preinst() { |
133 |
+ # create quassel user |
134 |
+ enewuser ${PN} -1 -1 /var/lib/${PN} "${PN}" |
135 |
+} |
136 |
+ |
137 |
pkg_postinst() { |
138 |
- if use server ; then |
139 |
- ewarn |
140 |
- ewarn "In order to use the quassel init script you must set the" |
141 |
- ewarn "QUASSEL_USER variable in ${ROOT%/}/etc/conf.d/quasselcore to your username." |
142 |
- ewarn "Note: This is the user who runs the quasselcore and is independent" |
143 |
- ewarn "from the users you set up in the quasselclient." |
144 |
+ if use server && use ssl; then |
145 |
+ # inform about genreating ssl certificate |
146 |
+ elog "If you want to use ssl connection to your core, please generate ssl key, with folowing command:" |
147 |
+ elog "# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /var/lib/${PN}/quasselCert.pem -ou" |
148 |
+ echo |
149 |
+ elog "Also remember that with the above command the key is valid only for 1 year." |
150 |
fi |
151 |
|
152 |
- if ( use server || use monolithic ) && use ssl ; then |
153 |
- elog |
154 |
+ if ( use monolithic || [[ ${FORCED_MONO} == "yes" ]] ) && use ssl ; then |
155 |
+ echo |
156 |
elog "Information on how to enable SSL support for client/core connections" |
157 |
elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc." |
158 |
fi |
159 |
+ |
160 |
+ # temporary info mesage |
161 |
+ if use server; then |
162 |
+ ewarn "Please note that all configuration moved from" |
163 |
+ ewarn "/home/\${QUASSEL_USER}/.config/quassel-irc.org/" |
164 |
+ ewarn "to: /var/lib/${PN}/." |
165 |
+ echo |
166 |
+ ewarn "For migration. Stop the core, move the files to new location and then start server again." |
167 |
+ fi |
168 |
} |