Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/dbus/
Date: Tue, 29 Nov 2016 09:04:04
Message-Id: 1480410234.982d55485636f90bd000ef6a79e2b2257e9d700c.polynomial-c@gentoo
1 commit: 982d55485636f90bd000ef6a79e2b2257e9d700c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 29 09:03:54 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 29 09:03:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=982d5548
7
8 sys-apps/dbus: Removed old.
9
10 Package-Manager: portage-2.3.2
11
12 sys-apps/dbus/Manifest | 1 -
13 sys-apps/dbus/dbus-1.10.10.ebuild | 268 --------------------------------------
14 2 files changed, 269 deletions(-)
15
16 diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
17 index e4f706e..621bc30 100644
18 --- a/sys-apps/dbus/Manifest
19 +++ b/sys-apps/dbus/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST dbus-1.10.10.tar.gz 1984077 SHA256 9d8f1d069ab4d1a0255d7b400ea3bcef4430c42e729b1012abb2890e3f739a43 SHA512 8875c43d1f100461c3482a247f1a9d3ffd4377ae81e97676e0111d57f0393d53beeebb965c8a06054bf3af1ae4c72e1e456fdbc42c7ababc4e153e5ce7c23489 WHIRLPOOL 990b46bc75574108bd456579b77434d70767c15464df0f396bcd063ad1f3edeef74a4e6d6f388a3cbe006fb0d10067e5efa322afd28f2ffe7d50bf1d6b13f535
22 DIST dbus-1.10.12.tar.gz 1984805 SHA256 210a79430b276eafc6406c71705e9140d25b9956d18068df98a70156dc0e475d SHA512 6616c7b2926a6fb6158d0a0a24d1b887173ca215a2f3185b95cc5f08df64fed1977e16c86c6ae530960453b6c585ae24ea4c9976e7537a45f9c6366c43baa52d WHIRLPOOL 9bd9ed70c4d9890dad09b2bcd07ee40ef472f1436cefe3bc89aaddbb183532939d6ce19da721a673a39f2e6b07e634b179190cec00e1a48fa2d9be6c830cc696
23 DIST dbus-1.10.14.tar.gz 1985828 SHA256 23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083 SHA512 87eda0117ee5fd47952f37a227cc017acdaa174a28e59ecd0c9f2501ffd5d56d015865d472dd9a922d8a52184662bfebff86279eb7431d19583958dd9e4dae26 WHIRLPOOL 83ded40df7b005b9247c9f1c82befc3c989becea0702998df5d43a9fb73489b0d222142a0d32fd11523e839ba8729dc824ff547d13d4c68fe390c788d2c5c750
24 DIST dbus-1.10.8.tar.gz 1976732 SHA256 baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014 SHA512 becc6c27b81a716ca498f3cdce2dae9fe5b39d7d334f66a9eae7ae8ce6448ea8c5fdfc500138371992828693a2f8f3a503efb147e163103aa64eac9b4bcf9906 WHIRLPOOL 3b2276bbc606a3997dd95d831271b8b102f45e8fc5696d88886f1e7b72fd134413cd3d3dd1a2608dcdfdf8d4caefc94e634c90b278fccd7d74cc4cce44696d92
25
26 diff --git a/sys-apps/dbus/dbus-1.10.10.ebuild b/sys-apps/dbus/dbus-1.10.10.ebuild
27 deleted file mode 100644
28 index 3d6b039..00000000
29 --- a/sys-apps/dbus/dbus-1.10.10.ebuild
30 +++ /dev/null
31 @@ -1,268 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI=6
37 -PYTHON_COMPAT=( python2_7 )
38 -
39 -inherit autotools eutils linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
40 -
41 -DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
42 -HOMEPAGE="https://dbus.freedesktop.org/"
43 -SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
44 -
45 -LICENSE="|| ( AFL-2.1 GPL-2 )"
46 -SLOT="0"
47 -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"
48 -IUSE="debug doc selinux static-libs systemd test user-session X"
49 -
50 -RESTRICT="test"
51 -
52 -CDEPEND="
53 - >=dev-libs/expat-2
54 - selinux? (
55 - sys-libs/libselinux
56 - )
57 - systemd? ( sys-apps/systemd:0= )
58 - X? (
59 - x11-libs/libX11
60 - x11-libs/libXt
61 - )
62 - abi_x86_32? (
63 - !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
64 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
65 - )
66 -"
67 -DEPEND="${CDEPEND}
68 - app-text/xmlto
69 - app-text/docbook-xml-dtd:4.4
70 - virtual/pkgconfig
71 - doc? ( app-doc/doxygen )
72 - test? (
73 - >=dev-libs/glib-2.36:2
74 - ${PYTHON_DEPS}
75 - )
76 -"
77 -RDEPEND="${CDEPEND}
78 - selinux? ( sec-policy/selinux-dbus )
79 -"
80 -
81 -DOC_CONTENTS="
82 - Some applications require a session bus in addition to the system
83 - bus. Please see \`man dbus-launch\` for more information.
84 -"
85 -
86 -# out of sources build dir for make check
87 -TBD=${WORKDIR}/${P}-tests-build
88 -
89 -pkg_setup() {
90 - enewgroup messagebus
91 - enewuser messagebus -1 -1 -1 messagebus
92 -
93 - use test && python-any-r1_pkg_setup
94 -
95 - if use kernel_linux; then
96 - CONFIG_CHECK="~EPOLL"
97 - linux-info_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 - eapply_user
109 -
110 - # required for asneeded patch but also for bug 263909, cross-compile so
111 - # don't remove eautoreconf
112 - eautoreconf
113 -}
114 -
115 -multilib_src_configure() {
116 - local docconf myconf
117 -
118 - # so we can get backtraces from apps
119 - case ${CHOST} in
120 - *-mingw*)
121 - # error: unrecognized command line option '-rdynamic' wrt #488036
122 - ;;
123 - *)
124 - append-flags -rdynamic
125 - ;;
126 - esac
127 -
128 - # libaudit is *only* used in DBus wrt SELinux support, so disable it, if
129 - # not on an SELinux profile.
130 - myconf=(
131 - --localstatedir="${EPREFIX}/var"
132 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
133 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
134 - $(use_enable static-libs static)
135 - $(use_enable debug verbose-mode)
136 - --disable-asserts
137 - --disable-checks
138 - $(use_enable selinux)
139 - $(use_enable selinux libaudit)
140 - --disable-apparmor
141 - $(use_enable kernel_linux inotify)
142 - $(use_enable kernel_FreeBSD kqueue)
143 - $(use_enable systemd)
144 - $(use_enable user-session)
145 - --disable-embedded-tests
146 - --disable-modular-tests
147 - $(use_enable debug stats)
148 - --with-session-socket-dir="${EPREFIX}"/tmp
149 - --with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
150 - --with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
151 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
152 - --with-dbus-user=messagebus
153 - $(use_with X x)
154 - )
155 -
156 - if [[ ${CHOST} == *-darwin* ]]; then
157 - myconf+=(
158 - --enable-launchd
159 - --with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
160 - )
161 - fi
162 -
163 - if multilib_is_native_abi; then
164 - docconf=(
165 - --enable-xml-docs
166 - $(use_enable doc doxygen-docs)
167 - )
168 - else
169 - docconf=(
170 - --disable-xml-docs
171 - --disable-doxygen-docs
172 - )
173 - myconf+=(
174 - --disable-selinux
175 - --disable-libaudit
176 - --disable-systemd
177 - --without-x
178 -
179 - # expat is used for the daemon only
180 - # fake the check for multilib library build
181 - ac_cv_lib_expat_XML_ParserCreate_MM=yes
182 - )
183 - fi
184 -
185 - einfo "Running configure in ${BUILD_DIR}"
186 - ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
187 -
188 - if multilib_is_native_abi && use test; then
189 - mkdir "${TBD}" || die
190 - cd "${TBD}" || die
191 - einfo "Running configure in ${TBD}"
192 - ECONF_SOURCE="${S}" econf "${myconf[@]}" \
193 - $(use_enable test asserts) \
194 - $(use_enable test checks) \
195 - $(use_enable test embedded-tests) \
196 - $(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
197 - fi
198 -}
199 -
200 -multilib_src_compile() {
201 - if multilib_is_native_abi; then
202 - # after the compile, it uses a selinuxfs interface to
203 - # check if the SELinux policy has the right support
204 - use selinux && addwrite /selinux/access
205 -
206 - einfo "Running make in ${BUILD_DIR}"
207 - emake
208 -
209 - if use test; then
210 - einfo "Running make in ${TBD}"
211 - emake -C "${TBD}"
212 - fi
213 - else
214 - emake -C dbus libdbus-1.la
215 - fi
216 -}
217 -
218 -src_test() {
219 - DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
220 -}
221 -
222 -multilib_src_install() {
223 - if multilib_is_native_abi; then
224 - emake DESTDIR="${D}" install
225 - else
226 - emake DESTDIR="${D}" install-pkgconfigDATA
227 - emake DESTDIR="${D}" -C dbus \
228 - install-libLTLIBRARIES install-dbusincludeHEADERS \
229 - install-nodist_dbusarchincludeHEADERS
230 - fi
231 -}
232 -
233 -multilib_src_install_all() {
234 - newinitd "${FILESDIR}"/dbus.initd-r1 dbus
235 -
236 - if use X; then
237 - # dbus X session script (#77504)
238 - # turns out to only work for GDM (and startx). has been merged into
239 - # other desktop (kdm and such scripts)
240 - exeinto /etc/X11/xinit/xinitrc.d
241 - doexe "${FILESDIR}"/80-dbus
242 - fi
243 -
244 - # needs to exist for dbus sessions to launch
245 - keepdir /usr/share/dbus-1/services
246 - keepdir /etc/dbus-1/{session,system}.d
247 - # machine-id symlink from pkg_postinst()
248 - keepdir /var/lib/dbus
249 - # let the init script create the /var/run/dbus directory
250 - rm -rf "${ED}"/var/run
251 -
252 - dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
253 - readme.gentoo_create_doc
254 -
255 - prune_libtool_files --all
256 -}
257 -
258 -pkg_postinst() {
259 - readme.gentoo_print_elog
260 -
261 - # Ensure unique id is generated and put it in /etc wrt #370451 but symlink
262 - # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
263 - # dependencies with hardcoded paths (although the known ones got fixed already)
264 - dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
265 - ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
266 -
267 - if [[ ${CHOST} == *-darwin* ]]; then
268 - local plist="org.freedesktop.dbus-session.plist"
269 - elog
270 - elog
271 - elog "For MacOS/Darwin we now ship launchd support for dbus."
272 - elog "This enables autolaunch of dbus at session login and makes"
273 - elog "dbus usable under MacOS/Darwin."
274 - elog
275 - elog "The launchd plist file ${plist} has been"
276 - elog "installed in ${EPREFIX}/Library/LaunchAgents."
277 - elog "For it to be used, you will have to do all of the following:"
278 - elog " + cd ~/Library/LaunchAgents"
279 - elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
280 - elog " + logout and log back in"
281 - elog
282 - elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
283 - elog "specified and refused to start otherwise, then export the"
284 - elog "the following to your environment:"
285 - elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
286 - fi
287 -
288 - if use user-session; then
289 - ewarn "You have enabled user-session. Please note this can cause"
290 - ewarn "bogus behaviors in several dbus consumers that are not prepared"
291 - ewarn "for this dbus activation method yet."
292 - ewarn
293 - ewarn "See the following link for background on this change:"
294 - ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
295 - ewarn
296 - ewarn "Known issues are tracked here:"
297 - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
298 - fi
299 -}