Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/dbus: ChangeLog dbus-1.8.20.ebuild
Date: Sat, 25 Jul 2015 21:54:09
Message-Id: 20150725215406.400C1C3@oystercatcher.gentoo.org
1 polynomial-c 15/07/25 21:54:06
2
3 Modified: ChangeLog
4 Added: dbus-1.8.20.ebuild
5 Log:
6 Version bump
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 981CA6FC)
9
10 Revision Changes Path
11 1.478 sys-apps/dbus/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.478&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.478&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.477&r2=1.478
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v
20 retrieving revision 1.477
21 retrieving revision 1.478
22 diff -u -r1.477 -r1.478
23 --- ChangeLog 4 Jul 2015 16:20:14 -0000 1.477
24 +++ ChangeLog 25 Jul 2015 21:54:06 -0000 1.478
25 @@ -1,6 +1,11 @@
26 # ChangeLog for sys-apps/dbus
27 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.477 2015/07/04 16:20:14 pacho Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.478 2015/07/25 21:54:06 polynomial-c Exp $
30 +
31 +*dbus-1.8.20 (25 Jul 2015)
32 +
33 + 25 Jul 2015; Lars Wendler <polynomial-c@g.o> +dbus-1.8.20.ebuild:
34 + Version bump.
35
36 *dbus-1.8.18 (04 Jul 2015)
37
38
39
40
41 1.1 sys-apps/dbus/dbus-1.8.20.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.20.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.20.ebuild?rev=1.1&content-type=text/plain
45
46 Index: dbus-1.8.20.ebuild
47 ===================================================================
48 # Copyright 1999-2015 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.8.20.ebuild,v 1.1 2015/07/25 21:54:06 polynomial-c Exp $
51
52 EAPI=5
53 PYTHON_COMPAT=( python2_7 )
54
55 inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo systemd virtualx user multilib-minimal
56
57 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
58 HOMEPAGE="http://dbus.freedesktop.org/"
59 SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
60
61 LICENSE="|| ( AFL-2.1 GPL-2 )"
62 SLOT="0"
63 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
64 IUSE="debug doc selinux static-libs systemd test X"
65
66 CDEPEND="
67 >=dev-libs/expat-2
68 selinux? (
69 sys-libs/libselinux
70 )
71 systemd? ( sys-apps/systemd:0= )
72 X? (
73 x11-libs/libX11
74 x11-libs/libXt
75 )
76 abi_x86_32? (
77 !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
78 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
79 )
80 "
81 DEPEND="${CDEPEND}
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:2
88 ${PYTHON_DEPS}
89 )
90 "
91 RDEPEND="${CDEPEND}
92 selinux? ( sec-policy/selinux-dbus )
93 "
94
95 DOC_CONTENTS="
96 Some applications require a session bus in addition to the system
97 bus. Please see \`man dbus-launch\` for more information.
98 "
99
100 # out of sources build dir for make check
101 TBD=${WORKDIR}/${P}-tests-build
102
103 pkg_setup() {
104 enewgroup messagebus
105 enewuser messagebus -1 -1 -1 messagebus
106
107 use test && python-any-r1_pkg_setup
108
109 if use kernel_linux; then
110 CONFIG_CHECK="~EPOLL"
111 linux-info_pkg_setup
112 fi
113 }
114
115 src_prepare() {
116 # Tests were restricted because of this
117 sed -i \
118 -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
119 -e '/"dispatch"/d' \
120 bus/test-main.c || die
121
122 epatch_user
123
124 # required for asneeded patch but also for bug 263909, cross-compile so
125 # don't remove eautoreconf
126 eautoreconf
127 }
128
129 multilib_src_configure() {
130 local docconf myconf
131
132 # so we can get backtraces from apps
133 case ${CHOST} in
134 *-mingw*)
135 # error: unrecognized command line option '-rdynamic' wrt #488036
136 ;;
137 *)
138 append-flags -rdynamic
139 ;;
140 esac
141
142 # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
143 # not on an SELinux profile.
144 myconf=(
145 --localstatedir="${EPREFIX}/var"
146 --docdir="${EPREFIX}/usr/share/doc/${PF}"
147 --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
148 $(use_enable static-libs static)
149 $(use_enable debug verbose-mode)
150 --disable-asserts
151 --disable-checks
152 $(use_enable selinux)
153 $(use_enable selinux libaudit)
154 $(use_enable kernel_linux inotify)
155 $(use_enable kernel_FreeBSD kqueue)
156 $(use_enable systemd)
157 --disable-embedded-tests
158 --disable-modular-tests
159 $(use_enable debug stats)
160 --with-session-socket-dir="${EPREFIX}"/tmp
161 --with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
162 --with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
163 --with-dbus-user=messagebus
164 $(use_with X x)
165 "$(systemd_with_unitdir)"
166 )
167
168 if [[ ${CHOST} == *-darwin* ]]; then
169 myconf+=(
170 --enable-launchd
171 --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
172 )
173 fi
174
175 if multilib_is_native_abi; then
176 docconf=(
177 --enable-xml-docs
178 $(use_enable doc doxygen-docs)
179 )
180 else
181 docconf=(
182 --disable-xml-docs
183 --disable-doxygen-docs
184 )
185 myconf+=(
186 --disable-selinux
187 --disable-libaudit
188 --disable-systemd
189 --without-x
190
191 # expat is used for the daemon only
192 # fake the check for multilib library build
193 ac_cv_lib_expat_XML_ParserCreate_MM=yes
194 )
195 fi
196
197 einfo "Running configure in ${BUILD_DIR}"
198 ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
199
200 if multilib_is_native_abi && use test; then
201 mkdir "${TBD}" || die
202 cd "${TBD}" || die
203 einfo "Running configure in ${TBD}"
204 ECONF_SOURCE="${S}" econf "${myconf[@]}" \
205 $(use_enable test asserts) \
206 $(use_enable test checks) \
207 $(use_enable test embedded-tests) \
208 $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
209 fi
210 }
211
212 multilib_src_compile() {
213 if multilib_is_native_abi; then
214 # after the compile, it uses a selinuxfs interface to
215 # check if the SELinux policy has the right support
216 use selinux && addwrite /selinux/access
217
218 einfo "Running make in ${BUILD_DIR}"
219 emake
220
221 if use test; then
222 einfo "Running make in ${TBD}"
223 emake -C "${TBD}"
224 fi
225 else
226 emake -C dbus libdbus-1.la
227 fi
228 }
229
230 src_test() {
231 DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
232 }
233
234 multilib_src_install() {
235 if multilib_is_native_abi; then
236 emake DESTDIR="${D}" install
237 else
238 emake DESTDIR="${D}" install-pkgconfigDATA
239 emake DESTDIR="${D}" -C dbus \
240 install-libLTLIBRARIES install-dbusincludeHEADERS \
241 install-nodist_dbusarchincludeHEADERS
242 fi
243 }
244
245 multilib_src_install_all() {
246 newinitd "${FILESDIR}"/dbus.initd dbus
247
248 if use X; then
249 # dbus X session script (#77504)
250 # turns out to only work for GDM (and startx). has been merged into
251 # other desktop (kdm and such scripts)
252 exeinto /etc/X11/xinit/xinitrc.d
253 doexe "${FILESDIR}"/80-dbus
254 fi
255
256 # needs to exist for dbus sessions to launch
257 keepdir /usr/share/dbus-1/services
258 keepdir /etc/dbus-1/{session,system}.d
259 # machine-id symlink from pkg_postinst()
260 keepdir /var/lib/dbus
261 # let the init script create the /var/run/dbus directory
262 rm -rf "${ED}"/var/run
263
264 dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
265 readme.gentoo_create_doc
266
267 prune_libtool_files --all
268 }
269
270 pkg_postinst() {
271 readme.gentoo_print_elog
272
273 # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
274 # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
275 # dependencies with hardcoded paths (although the known ones got fixed already)
276 dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
277 ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
278
279 if [[ ${CHOST} == *-darwin* ]]; then
280 local plist="org.freedesktop.dbus-session.plist"
281 elog
282 elog
283 elog "For MacOS/Darwin we now ship launchd support for dbus."
284 elog "This enables autolaunch of dbus at session login and makes"
285 elog "dbus usable under MacOS/Darwin."
286 elog
287 elog "The launchd plist file ${plist} has been"
288 elog "installed in ${EPREFIX}/Library/LaunchAgents."
289 elog "For it to be used, you will have to do all of the following:"
290 elog " + cd ~/Library/LaunchAgents"
291 elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
292 elog " + logout and log back in"
293 elog
294 elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
295 elog "specified and refused to start otherwise, then export the"
296 elog "the following to your environment:"
297 elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
298 fi
299 }