1 |
floppym 14/02/26 19:07:52 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: dbus-1.8.0-r1.ebuild |
5 |
Removed: dbus-1.8.0.ebuild |
6 |
Log: |
7 |
Add slot-operator to systemd dependency. |
8 |
|
9 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
10 |
|
11 |
Revision Changes Path |
12 |
1.408 sys-apps/dbus/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.408&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.408&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.407&r2=1.408 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v |
21 |
retrieving revision 1.407 |
22 |
retrieving revision 1.408 |
23 |
diff -u -r1.407 -r1.408 |
24 |
--- ChangeLog 23 Feb 2014 16:17:35 -0000 1.407 |
25 |
+++ ChangeLog 26 Feb 2014 19:07:52 -0000 1.408 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for sys-apps/dbus |
28 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.407 2014/02/23 16:17:35 pacho Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.408 2014/02/26 19:07:52 floppym Exp $ |
31 |
+ |
32 |
+*dbus-1.8.0-r1 (26 Feb 2014) |
33 |
+ |
34 |
+ 26 Feb 2014; Mike Gilbert <floppym@g.o> +dbus-1.8.0-r1.ebuild, |
35 |
+ -dbus-1.8.0.ebuild: |
36 |
+ Add slot-operator to systemd dependency. |
37 |
|
38 |
23 Feb 2014; Pacho Ramos <pacho@g.o> dbus-1.6.18-r1.ebuild: |
39 |
x86 stable, bug #496628 |
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-apps/dbus/dbus-1.8.0-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.0-r1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.0-r1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: dbus-1.8.0-r1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2014 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.0-r1.ebuild,v 1.1 2014/02/26 19:07:52 floppym Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
PYTHON_COMPAT=( python2_7 ) |
56 |
inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 systemd virtualx user |
57 |
|
58 |
DESCRIPTION="A message bus system, a simple way for applications to talk to each other" |
59 |
HOMEPAGE="http://dbus.freedesktop.org/" |
60 |
SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" |
61 |
|
62 |
LICENSE="|| ( AFL-2.1 GPL-2 )" |
63 |
SLOT="0" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" |
65 |
IUSE="debug doc selinux static-libs systemd test X" |
66 |
|
67 |
RDEPEND=">=dev-libs/expat-2 |
68 |
selinux? ( |
69 |
sec-policy/selinux-dbus |
70 |
sys-libs/libselinux |
71 |
) |
72 |
systemd? ( sys-apps/systemd:0= ) |
73 |
X? ( |
74 |
x11-libs/libX11 |
75 |
x11-libs/libXt |
76 |
) |
77 |
abi_x86_32? ( |
78 |
!<=app-emulation/emul-linux-x86-baselibs-20131008-r4 |
79 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
80 |
)" |
81 |
DEPEND="${RDEPEND} |
82 |
app-text/xmlto |
83 |
app-text/docbook-xml-dtd:4.4 |
84 |
virtual/pkgconfig |
85 |
doc? ( app-doc/doxygen ) |
86 |
test? ( |
87 |
>=dev-libs/glib-2.24 |
88 |
${PYTHON_DEPS} |
89 |
)" |
90 |
|
91 |
# out of sources build dir for make check |
92 |
TBD=${WORKDIR}/${P}-tests-build |
93 |
|
94 |
pkg_setup() { |
95 |
enewgroup messagebus |
96 |
enewuser messagebus -1 -1 -1 messagebus |
97 |
|
98 |
use test && python-any-r1_pkg_setup |
99 |
|
100 |
if use kernel_linux; then |
101 |
CONFIG_CHECK="~EPOLL" |
102 |
linux-info_pkg_setup |
103 |
fi |
104 |
} |
105 |
|
106 |
src_prepare() { |
107 |
# Tests were restricted because of this |
108 |
sed -i \ |
109 |
-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \ |
110 |
-e '/"dispatch"/d' \ |
111 |
bus/test-main.c || die |
112 |
|
113 |
epatch_user |
114 |
|
115 |
# required for asneeded patch but also for bug 263909, cross-compile so |
116 |
# don't remove eautoreconf |
117 |
eautoreconf |
118 |
} |
119 |
|
120 |
multilib_src_configure() { |
121 |
local docconf myconf |
122 |
|
123 |
# so we can get backtraces from apps |
124 |
case ${CHOST} in |
125 |
*-mingw*) |
126 |
# error: unrecognized command line option '-rdynamic' wrt #488036 |
127 |
;; |
128 |
*) |
129 |
append-flags -rdynamic |
130 |
;; |
131 |
esac |
132 |
|
133 |
# libaudit is *only* used in DBus wrt SELinux support, so disable it, if |
134 |
# not on an SELinux profile. |
135 |
myconf=( |
136 |
--localstatedir="${EPREFIX}/var" |
137 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" |
138 |
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" |
139 |
$(use_enable static-libs static) |
140 |
$(use_enable debug verbose-mode) |
141 |
--disable-asserts |
142 |
--disable-checks |
143 |
$(use_enable selinux) |
144 |
$(use_enable selinux libaudit) |
145 |
$(use_enable kernel_linux inotify) |
146 |
$(use_enable kernel_FreeBSD kqueue) |
147 |
$(use_enable systemd) |
148 |
--disable-embedded-tests |
149 |
--disable-modular-tests |
150 |
$(use_enable debug stats) |
151 |
--with-session-socket-dir=/tmp |
152 |
--with-system-pid-file=/var/run/dbus.pid |
153 |
--with-system-socket=/var/run/dbus/system_bus_socket |
154 |
--with-dbus-user=messagebus |
155 |
$(use_with X x) |
156 |
"$(systemd_with_unitdir)" |
157 |
) |
158 |
|
159 |
if multilib_build_binaries; then |
160 |
docconf=( |
161 |
--enable-xml-docs |
162 |
$(use_enable doc doxygen-docs) |
163 |
) |
164 |
else |
165 |
docconf=( |
166 |
--disable-xml-docs |
167 |
--disable-doxygen-docs |
168 |
) |
169 |
myconf+=( |
170 |
--disable-selinux |
171 |
--disable-libaudit |
172 |
--disable-systemd |
173 |
--without-x |
174 |
) |
175 |
fi |
176 |
|
177 |
einfo "Running configure in ${BUILD_DIR}" |
178 |
ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" |
179 |
|
180 |
if multilib_build_binaries && use test; then |
181 |
mkdir "${TBD}" |
182 |
cd "${TBD}" |
183 |
einfo "Running configure in ${TBD}" |
184 |
ECONF_SOURCE="${S}" econf "${myconf[@]}" \ |
185 |
$(use_enable test asserts) \ |
186 |
$(use_enable test checks) \ |
187 |
$(use_enable test embedded-tests) \ |
188 |
$(has_version dev-libs/dbus-glib && echo --enable-modular-tests) |
189 |
fi |
190 |
} |
191 |
|
192 |
multilib_src_compile() { |
193 |
if multilib_build_binaries; then |
194 |
# after the compile, it uses a selinuxfs interface to |
195 |
# check if the SELinux policy has the right support |
196 |
use selinux && addwrite /selinux/access |
197 |
|
198 |
einfo "Running make in ${BUILD_DIR}" |
199 |
emake |
200 |
|
201 |
if multilib_build_binaries && use test; then |
202 |
cd "${TBD}" |
203 |
einfo "Running make in ${TBD}" |
204 |
emake |
205 |
fi |
206 |
else |
207 |
emake -C dbus libdbus-1.la |
208 |
fi |
209 |
} |
210 |
|
211 |
src_test() { |
212 |
cd "${TBD}" |
213 |
DBUS_VERBOSE=1 Xemake -j1 check |
214 |
} |
215 |
|
216 |
multilib_src_install() { |
217 |
if multilib_build_binaries; then |
218 |
emake DESTDIR="${D}" install |
219 |
else |
220 |
emake DESTDIR="${D}" install-pkgconfigDATA |
221 |
emake DESTDIR="${D}" -C dbus \ |
222 |
install-libLTLIBRARIES install-dbusincludeHEADERS \ |
223 |
install-nodist_dbusarchincludeHEADERS |
224 |
fi |
225 |
} |
226 |
|
227 |
multilib_src_install_all() { |
228 |
newinitd "${FILESDIR}"/dbus.initd dbus |
229 |
|
230 |
if use X; then |
231 |
# dbus X session script (#77504) |
232 |
# turns out to only work for GDM (and startx). has been merged into |
233 |
# other desktop (kdm and such scripts) |
234 |
exeinto /etc/X11/xinit/xinitrc.d |
235 |
doexe "${FILESDIR}"/80-dbus |
236 |
fi |
237 |
|
238 |
# needs to exist for dbus sessions to launch |
239 |
keepdir /usr/share/dbus-1/services |
240 |
keepdir /etc/dbus-1/{session,system}.d |
241 |
# machine-id symlink from pkg_postinst() |
242 |
keepdir /var/lib/dbus |
243 |
|
244 |
dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO |
245 |
prune_libtool_files --all |
246 |
} |
247 |
|
248 |
pkg_postinst() { |
249 |
if [ "$(rc-config list default | grep dbus)" = "" ] ; then |
250 |
elog "To start the D-Bus system-wide messagebus by default" |
251 |
elog "you should add it to the default runlevel :" |
252 |
elog "\`rc-update add dbus default\`" |
253 |
elog |
254 |
fi |
255 |
|
256 |
elog "Some applications require a session bus in addition to the system" |
257 |
elog "bus. Please see \`man dbus-launch\` for more information." |
258 |
elog |
259 |
|
260 |
if [ "$(rc-status | grep dbus | grep started)" ] ; then |
261 |
ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run" |
262 |
ewarn "the new version of the daemon." |
263 |
ewarn "Don't do this while X is running because it will restart your X as well." |
264 |
fi |
265 |
|
266 |
# Ensure unique id is generated and put it in /etc wrt #370451 but symlink |
267 |
# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse |
268 |
# dependencies with hardcoded paths (although the known ones got fixed already) |
269 |
dbus-uuidgen --ensure="${EROOT}"/etc/machine-id |
270 |
ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id |
271 |
} |