1 |
ssuominen 11/05/05 16:44:25 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: dbus-1.4.8-r1.ebuild |
5 |
Removed: dbus-1.4.8.ebuild |
6 |
Log: |
7 |
Revbump for last change so systemd can be moved to Portage. |
8 |
|
9 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.288 sys-apps/dbus/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.288&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.288&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.287&r2=1.288 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v |
21 |
retrieving revision 1.287 |
22 |
retrieving revision 1.288 |
23 |
diff -u -r1.287 -r1.288 |
24 |
--- ChangeLog 5 May 2011 12:58:16 -0000 1.287 |
25 |
+++ ChangeLog 5 May 2011 16:44:25 -0000 1.288 |
26 |
@@ -1,8 +1,10 @@ |
27 |
# ChangeLog for sys-apps/dbus |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.287 2011/05/05 12:58:16 ssuominen Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.288 2011/05/05 16:44:25 ssuominen Exp $ |
31 |
|
32 |
- 05 May 2011; Samuli Suominen <ssuominen@g.o> dbus-1.4.8.ebuild: |
33 |
+*dbus-1.4.8-r1 (05 May 2011) |
34 |
+ |
35 |
+ 05 May 2011; Samuli Suominen <ssuominen@g.o> +dbus-1.4.8-r1.ebuild: |
36 |
Use systemd.eclass to get path for unit files wrt #365941 by Michał Górny. |
37 |
|
38 |
26 Apr 2011; Samuli Suominen <ssuominen@g.o> dbus-1.4.8.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-apps/dbus/dbus-1.4.8-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.4.8-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.4.8-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: dbus-1.4.8-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2011 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.8-r1.ebuild,v 1.1 2011/05/05 16:44:25 ssuominen Exp $ |
52 |
|
53 |
EAPI=2 |
54 |
inherit autotools eutils multilib flag-o-matic python systemd virtualx |
55 |
|
56 |
DESCRIPTION="A message bus system, a simple way for applications to talk to each other" |
57 |
HOMEPAGE="http://dbus.freedesktop.org/" |
58 |
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" |
59 |
|
60 |
LICENSE="|| ( GPL-2 AFL-2.1 )" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
63 |
IUSE="debug doc selinux static-libs test X" |
64 |
|
65 |
RDEPEND=" |
66 |
X? ( |
67 |
x11-libs/libX11 |
68 |
x11-libs/libXt |
69 |
) |
70 |
selinux? ( |
71 |
sys-libs/libselinux |
72 |
sec-policy/selinux-dbus |
73 |
) |
74 |
>=dev-libs/expat-1.95.8 |
75 |
" |
76 |
DEPEND="${RDEPEND} |
77 |
dev-util/pkgconfig |
78 |
doc? ( |
79 |
app-doc/doxygen |
80 |
app-text/docbook-xml-dtd:4.1.2 |
81 |
app-text/xmlto |
82 |
) |
83 |
test? ( =dev-lang/python-2* ) |
84 |
" |
85 |
|
86 |
# out of sources build directory |
87 |
BD=${WORKDIR}/${P}-build |
88 |
# out of sources build dir for make check |
89 |
TBD=${WORKDIR}/${P}-tests-build |
90 |
|
91 |
pkg_setup() { |
92 |
enewgroup messagebus |
93 |
enewuser messagebus -1 "-1" -1 messagebus |
94 |
|
95 |
if use test; then |
96 |
python_set_active_version 2 |
97 |
python_pkg_setup |
98 |
fi |
99 |
} |
100 |
|
101 |
src_prepare() { |
102 |
# Tests were restricted because of this |
103 |
sed -i \ |
104 |
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ |
105 |
-e '/"dispatch"/d' \ |
106 |
bus/test-main.c || die |
107 |
|
108 |
epatch "${FILESDIR}"/${PN}-1.4.0-asneeded.patch |
109 |
|
110 |
# required for asneeded patch but also for bug 263909, cross-compile so |
111 |
# don't remove eautoreconf |
112 |
eautoreconf |
113 |
} |
114 |
|
115 |
src_configure() { |
116 |
local my_conf |
117 |
|
118 |
# so we can get backtraces from apps |
119 |
append-flags -rdynamic |
120 |
|
121 |
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if |
122 |
# not on an SELinux profile. |
123 |
my_conf="$(use_with X x) |
124 |
$(use_enable debug verbose-mode) |
125 |
$(use_enable debug asserts) |
126 |
$(use_enable kernel_linux inotify) |
127 |
$(use_enable kernel_FreeBSD kqueue) |
128 |
$(use_enable selinux) |
129 |
$(use_enable selinux libaudit) |
130 |
$(use_enable static-libs static) |
131 |
--enable-shared |
132 |
--with-xml=expat |
133 |
--with-system-pid-file=/var/run/dbus.pid |
134 |
--with-system-socket=/var/run/dbus/system_bus_socket |
135 |
--with-session-socket-dir=/tmp |
136 |
--with-dbus-user=messagebus |
137 |
$(systemd_with_unitdir) |
138 |
--localstatedir=/var" |
139 |
|
140 |
mkdir "${BD}" |
141 |
cd "${BD}" |
142 |
einfo "Running configure in ${BD}" |
143 |
ECONF_SOURCE="${S}" econf ${my_conf} \ |
144 |
$(use_enable doc doxygen-docs) \ |
145 |
$(use_enable doc xml-docs) |
146 |
|
147 |
if use test; then |
148 |
mkdir "${TBD}" |
149 |
cd "${TBD}" |
150 |
einfo "Running configure in ${TBD}" |
151 |
ECONF_SOURCE="${S}" econf \ |
152 |
${my_conf} \ |
153 |
$(use_enable test checks) \ |
154 |
$(use_enable test tests) \ |
155 |
$(use_enable test asserts) |
156 |
fi |
157 |
} |
158 |
|
159 |
src_compile() { |
160 |
# after the compile, it uses a selinuxfs interface to |
161 |
# check if the SELinux policy has the right support |
162 |
use selinux && addwrite /selinux/access |
163 |
|
164 |
cd "${BD}" |
165 |
einfo "Running make in ${BD}" |
166 |
emake || die |
167 |
|
168 |
if use doc; then |
169 |
doxygen || die |
170 |
fi |
171 |
|
172 |
if use test; then |
173 |
cd "${TBD}" |
174 |
einfo "Running make in ${TBD}" |
175 |
emake || die |
176 |
fi |
177 |
} |
178 |
|
179 |
src_test() { |
180 |
cd "${TBD}" |
181 |
DBUS_VERBOSE=1 Xemake -j1 check || die |
182 |
} |
183 |
|
184 |
src_install() { |
185 |
# initscript |
186 |
newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die |
187 |
|
188 |
if use X ; then |
189 |
# dbus X session script (#77504) |
190 |
# turns out to only work for GDM (and startx). has been merged into |
191 |
# other desktop (kdm and such scripts) |
192 |
exeinto /etc/X11/xinit/xinitrc.d/ |
193 |
doexe "${FILESDIR}"/80-dbus || die |
194 |
fi |
195 |
|
196 |
# needs to exist for the system socket |
197 |
keepdir /var/run/dbus |
198 |
# needs to exist for machine id |
199 |
keepdir /var/lib/dbus |
200 |
# needs to exist for dbus sessions to launch |
201 |
|
202 |
keepdir /usr/lib/dbus-1.0/services |
203 |
keepdir /usr/share/dbus-1/services |
204 |
keepdir /etc/dbus-1/system.d/ |
205 |
keepdir /etc/dbus-1/session.d/ |
206 |
|
207 |
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO || die |
208 |
|
209 |
cd "${BD}" |
210 |
# FIXME: split dtd's in dbus-dtd ebuild |
211 |
emake DESTDIR="${D}" install || die |
212 |
if use doc; then |
213 |
dohtml -p api/ doc/api/html/* || die |
214 |
cd "${S}" |
215 |
dohtml doc/*.html || die |
216 |
fi |
217 |
|
218 |
# Remove .la files |
219 |
find "${D}" -type f -name '*.la' -exec rm -f {} + |
220 |
} |
221 |
|
222 |
pkg_postinst() { |
223 |
elog "To start the D-Bus system-wide messagebus by default" |
224 |
elog "you should add it to the default runlevel :" |
225 |
elog "\`rc-update add dbus default\`" |
226 |
elog |
227 |
elog "Some applications require a session bus in addition to the system" |
228 |
elog "bus. Please see \`man dbus-launch\` for more information." |
229 |
elog |
230 |
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run" |
231 |
ewarn "the new version of the daemon." |
232 |
ewarn "Don't do this while X is running because it will restart your X as well." |
233 |
|
234 |
# Ensure unique id is generated |
235 |
dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id |
236 |
} |