Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/dbus: dbus-1.6.18.ebuild ChangeLog
Date: Sat, 02 Nov 2013 07:04:14
Message-Id: 20131102070407.7E26F2004B@flycatcher.gentoo.org
1 ssuominen 13/11/02 07:04:07
2
3 Modified: ChangeLog
4 Added: dbus-1.6.18.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.395 sys-apps/dbus/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.395&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.395&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.394&r2=1.395
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v
20 retrieving revision 1.394
21 retrieving revision 1.395
22 diff -u -r1.394 -r1.395
23 --- ChangeLog 8 Oct 2013 16:50:16 -0000 1.394
24 +++ ChangeLog 2 Nov 2013 07:04:07 -0000 1.395
25 @@ -1,6 +1,11 @@
26 # ChangeLog for sys-apps/dbus
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.394 2013/10/08 16:50:16 ssuominen Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.395 2013/11/02 07:04:07 ssuominen Exp $
30 +
31 +*dbus-1.6.18 (02 Nov 2013)
32 +
33 + 02 Nov 2013; Samuli Suominen <ssuominen@g.o> +dbus-1.6.18.ebuild:
34 + Version bump.
35
36 *dbus-1.6.16 (08 Oct 2013)
37
38
39
40
41 1.1 sys-apps/dbus/dbus-1.6.18.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.6.18.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.6.18.ebuild?rev=1.1&content-type=text/plain
45
46 Index: dbus-1.6.18.ebuild
47 ===================================================================
48 # Copyright 1999-2013 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.18.ebuild,v 1.1 2013/11/02 07:04:07 ssuominen Exp $
51
52 EAPI=5
53 PYTHON_COMPAT=( python2_7 )
54 inherit autotools eutils linux-info flag-o-matic python-any-r1 systemd virtualx user
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="|| ( AFL-2.1 GPL-2 )"
61 SLOT="0"
62 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
63 IUSE="debug doc selinux static-libs systemd test X"
64
65 RDEPEND=">=dev-libs/expat-2
66 selinux? (
67 sec-policy/selinux-dbus
68 sys-libs/libselinux
69 )
70 systemd? ( sys-apps/systemd )
71 X? (
72 x11-libs/libX11
73 x11-libs/libXt
74 )"
75 DEPEND="${RDEPEND}
76 virtual/pkgconfig
77 doc? (
78 app-doc/doxygen
79 app-text/docbook-xml-dtd:4.1.2
80 app-text/xmlto
81 )
82 test? (
83 >=dev-libs/glib-2.24
84 ${PYTHON_DEPS}
85 )"
86
87 # out of sources build directory
88 BD=${WORKDIR}/${P}-build
89 # out of sources build dir for make check
90 TBD=${WORKDIR}/${P}-tests-build
91
92 pkg_setup() {
93 enewgroup messagebus
94 enewuser messagebus -1 -1 -1 messagebus
95
96 use test && python-any-r1_pkg_setup
97
98 if use kernel_linux; then
99 CONFIG_CHECK="~EPOLL"
100 linux-info_pkg_setup
101 fi
102 }
103
104 src_prepare() {
105 epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
106
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 # required for asneeded patch but also for bug 263909, cross-compile so
114 # don't remove eautoreconf
115 eautoreconf
116 }
117
118 src_configure() {
119 local myconf
120
121 # so we can get backtraces from apps
122 append-flags -rdynamic
123
124 # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
125 # not on an SELinux profile.
126 myconf=(
127 --disable-silent-rules
128 --localstatedir="${EPREFIX}/var"
129 --docdir="${EPREFIX}/usr/share/doc/${PF}"
130 --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
131 $(use_enable static-libs static)
132 $(use_enable debug verbose-mode)
133 --disable-asserts
134 --disable-checks
135 $(use_enable selinux)
136 $(use_enable selinux libaudit)
137 $(use_enable kernel_linux inotify)
138 $(use_enable kernel_FreeBSD kqueue)
139 $(use_enable systemd)
140 --disable-embedded-tests
141 --disable-modular-tests
142 $(use_enable debug stats)
143 --with-xml=expat
144 --with-session-socket-dir=/tmp
145 --with-system-pid-file=/var/run/dbus.pid
146 --with-system-socket=/var/run/dbus/system_bus_socket
147 --with-dbus-user=messagebus
148 $(use_with X x)
149 "$(systemd_with_unitdir)"
150 )
151
152 mkdir "${BD}"
153 cd "${BD}"
154 einfo "Running configure in ${BD}"
155 ECONF_SOURCE="${S}" econf "${myconf[@]}" \
156 $(use_enable doc xml-docs) \
157 $(use_enable doc doxygen-docs)
158
159 if use test; then
160 mkdir "${TBD}"
161 cd "${TBD}"
162 einfo "Running configure in ${TBD}"
163 ECONF_SOURCE="${S}" econf "${myconf[@]}" \
164 $(use_enable test asserts) \
165 $(use_enable test checks) \
166 $(use_enable test embedded-tests) \
167 $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
168 fi
169 }
170
171 src_compile() {
172 # after the compile, it uses a selinuxfs interface to
173 # check if the SELinux policy has the right support
174 use selinux && addwrite /selinux/access
175
176 cd "${BD}"
177 einfo "Running make in ${BD}"
178 emake
179
180 if use test; then
181 cd "${TBD}"
182 einfo "Running make in ${TBD}"
183 emake
184 fi
185 }
186
187 src_test() {
188 cd "${TBD}"
189 DBUS_VERBOSE=1 Xemake -j1 check
190 }
191
192 src_install() {
193 newinitd "${FILESDIR}"/dbus.initd dbus
194
195 if use X; then
196 # dbus X session script (#77504)
197 # turns out to only work for GDM (and startx). has been merged into
198 # other desktop (kdm and such scripts)
199 exeinto /etc/X11/xinit/xinitrc.d
200 doexe "${FILESDIR}"/80-dbus
201 fi
202
203 # needs to exist for dbus sessions to launch
204 keepdir /usr/share/dbus-1/services
205 keepdir /etc/dbus-1/{session,system}.d
206 # machine-id symlink from pkg_postinst()
207 keepdir /var/lib/dbus
208
209 dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
210
211 cd "${BD}"
212 emake DESTDIR="${D}" install
213
214 prune_libtool_files --all
215 }
216
217 pkg_postinst() {
218 if [ "$(rc-config list default | grep dbus)" = "" ] ; then
219 elog "To start the D-Bus system-wide messagebus by default"
220 elog "you should add it to the default runlevel :"
221 elog "\`rc-update add dbus default\`"
222 elog
223 fi
224
225 elog "Some applications require a session bus in addition to the system"
226 elog "bus. Please see \`man dbus-launch\` for more information."
227 elog
228
229 if [ "$(rc-status | grep dbus | grep started)" ] ; then
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 fi
234
235 # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
236 # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
237 # dependencies with hardcoded paths (although the known ones got fixed already)
238 dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
239 ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
240 }